Merge pull request #6 from TheCoder4eu/master

Update
TheCoder4eu · Mar 7, 2018 · eb44a25 · eb44a25
2 parents 5edc337 + d896794
commit eb44a25
Show file tree

Hide file tree

Showing 99 changed files with 208 additions and 171 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

diff --git a/gradleResources/staticResources/css/bsf.css b/gradleResources/staticResources/css/bsf.css
@@ -405,13 +405,13 @@ label.bf-fatal { color: red; }
 }
 
 /* Collapsible panels */
-.panel-heading a:after {
+.panel-heading a.panel-title-link:after {
     font-family:'Glyphicons Halflings';
     content:"\e114";
     float: right;
     color: grey;
 }
-.panel-heading a.collapsed:after {
+.panel-heading a.panel-title-link.collapsed:after {
     content:"\e080";
 }
 a.panel-title-link {

diff --git a/gradleResources/staticResources/less/bf/customizations.less b/gradleResources/staticResources/less/bf/customizations.less
@@ -2,13 +2,13 @@
 
 // Panels
 /* Collapsible panels */
-.panel-heading a:after {
+.panel-heading a.panel-title-link:after {
     font-family:'Glyphicons Halflings';
     content:"\e114";
     float: right;
     color: grey;
 }
-.panel-heading a.collapsed:after {
+.panel-heading a.panel-title-link.collapsed:after {
     content:"\e080";
 }
 a.panel-title-link {

diff --git a/mavenResources/META-INF/resources/bsf/css/bsf.css b/mavenResources/META-INF/resources/bsf/css/bsf.css
diff --git a/src/main/java/net/bootsfaces/component/accordion/Accordion.java b/src/main/java/net/bootsfaces/component/accordion/Accordion.java
@@ -21,8 +21,8 @@
 import javax.faces.application.ResourceDependencies;
 import javax.faces.application.ResourceDependency;
 import javax.faces.component.FacesComponent;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.IHasTooltip;

diff --git a/src/main/java/net/bootsfaces/component/ajax/AJAXRenderer.java b/src/main/java/net/bootsfaces/component/ajax/AJAXRenderer.java
@@ -35,7 +35,6 @@
 import net.bootsfaces.component.tabView.TabView;
 import net.bootsfaces.expressions.ExpressionResolver;
 import net.bootsfaces.render.CoreRenderer;
-import net.bootsfaces.utils.BsfUtils;
 
 public class AJAXRenderer extends CoreRenderer {
 	private static final Logger LOGGER = Logger.getLogger("net.bootsfaces.component.ajax.AJAXRenderer");

diff --git a/src/main/java/net/bootsfaces/component/alert/Alert.java b/src/main/java/net/bootsfaces/component/alert/Alert.java
@@ -22,8 +22,8 @@
 import javax.faces.application.ResourceDependency;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponentBase;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IHasTooltip;
 import net.bootsfaces.render.IResponsive;

diff --git a/src/main/java/net/bootsfaces/component/alert/AlertRenderer.java b/src/main/java/net/bootsfaces/component/alert/AlertRenderer.java
@@ -26,7 +26,6 @@
 import javax.faces.render.FacesRenderer;
 
 import net.bootsfaces.render.CoreRenderer;
-import net.bootsfaces.render.Responsive;
 import net.bootsfaces.render.Tooltip;
 
 /** This class generates the HTML code of &lt;b:alert /&gt;. */

diff --git a/src/main/java/net/bootsfaces/component/badge/Badge.java b/src/main/java/net/bootsfaces/component/badge/Badge.java
@@ -20,8 +20,8 @@
 
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.utils.BsfUtils;
 

diff --git a/src/main/java/net/bootsfaces/component/badge/BadgeRenderer.java b/src/main/java/net/bootsfaces/component/badge/BadgeRenderer.java
@@ -24,9 +24,8 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.FacesRenderer;
-import net.bootsfaces.render.CoreInputRenderer;
 
-import net.bootsfaces.render.CoreRenderer;
+import net.bootsfaces.render.CoreInputRenderer;
 import net.bootsfaces.render.IResponsive;
 import net.bootsfaces.render.Responsive;
 import net.bootsfaces.render.Tooltip;

diff --git a/src/main/java/net/bootsfaces/component/button/Button.java b/src/main/java/net/bootsfaces/component/button/Button.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.html.HtmlOutcomeTargetButton;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IHasTooltip;
 import net.bootsfaces.render.IResponsive;

diff --git a/src/main/java/net/bootsfaces/component/button/ButtonRenderer.java b/src/main/java/net/bootsfaces/component/button/ButtonRenderer.java
@@ -17,17 +17,18 @@
  */
 package net.bootsfaces.component.button;
 
-import javax.faces.FacesException;
-import javax.faces.application.ConfigurableNavigationHandler;
-import javax.faces.application.NavigationCase;
-import javax.faces.application.ProjectStage;
-import javax.faces.component.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.faces.FacesException;
+import javax.faces.application.ConfigurableNavigationHandler;
+import javax.faces.application.NavigationCase;
+import javax.faces.application.ProjectStage;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIParameter;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.FacesRenderer;

diff --git a/src/main/java/net/bootsfaces/component/buttonGroup/ButtonGroup.java b/src/main/java/net/bootsfaces/component/buttonGroup/ButtonGroup.java
@@ -20,8 +20,8 @@
 
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponentBase;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.IResponsive;

diff --git a/src/main/java/net/bootsfaces/component/buttonToolbar/ButtonToolbar.java b/src/main/java/net/bootsfaces/component/buttonToolbar/ButtonToolbar.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponentBase;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.IResponsive;

diff --git a/src/main/java/net/bootsfaces/component/canvas/Canvas.java b/src/main/java/net/bootsfaces/component/canvas/Canvas.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIOutput;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.render.IResponsive;
 import net.bootsfaces.render.Tooltip;
 import net.bootsfaces.utils.BsfUtils;

diff --git a/src/main/java/net/bootsfaces/component/carousel/CarouselRenderer.java b/src/main/java/net/bootsfaces/component/carousel/CarouselRenderer.java
@@ -31,7 +31,6 @@
 import net.bootsfaces.component.carouselControl.CarouselControlRenderer;
 import net.bootsfaces.component.carouselItem.CarouselItem;
 import net.bootsfaces.render.CoreRenderer;
-import net.bootsfaces.render.Responsive;
 import net.bootsfaces.render.Tooltip;
 
 /** This class generates the HTML code of &lt;b:carousel /&gt;. */

diff --git a/src/main/java/net/bootsfaces/component/carouselCaption/CarouselCaption.java b/src/main/java/net/bootsfaces/component/carouselCaption/CarouselCaption.java
@@ -27,8 +27,8 @@
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UICommand;
 import javax.faces.component.behavior.ClientBehaviorHolder;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.component.ajax.IAJAXComponent;
 import net.bootsfaces.render.Tooltip;
 import net.bootsfaces.utils.BsfUtils;

diff --git a/src/main/java/net/bootsfaces/component/carouselControl/CarouselControl.java b/src/main/java/net/bootsfaces/component/carouselControl/CarouselControl.java
@@ -27,8 +27,8 @@
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UICommand;
 import javax.faces.component.behavior.ClientBehaviorHolder;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.component.ajax.IAJAXComponent;
 import net.bootsfaces.render.Tooltip;
 import net.bootsfaces.utils.BsfUtils;

diff --git a/src/main/java/net/bootsfaces/component/carouselItem/CarouselItem.java b/src/main/java/net/bootsfaces/component/carouselItem/CarouselItem.java
@@ -27,8 +27,8 @@
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UICommand;
 import javax.faces.component.behavior.ClientBehaviorHolder;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.component.ajax.IAJAXComponent;
 import net.bootsfaces.render.Tooltip;
 import net.bootsfaces.utils.BsfUtils;

diff --git a/src/main/java/net/bootsfaces/component/column/Column.java b/src/main/java/net/bootsfaces/component/column/Column.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIOutput;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.IHasTooltip;

diff --git a/src/main/java/net/bootsfaces/component/commandButton/CommandButton.java b/src/main/java/net/bootsfaces/component/commandButton/CommandButton.java
@@ -26,8 +26,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.behavior.ClientBehaviorHolder;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.component.ajax.IAJAXComponent;
 import net.bootsfaces.component.ajax.IAJAXComponent2;
 import net.bootsfaces.listeners.AddResourcesListener;

diff --git a/src/main/java/net/bootsfaces/component/container/Container.java b/src/main/java/net/bootsfaces/component/container/Container.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIOutput;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.Tooltip;

diff --git a/src/main/java/net/bootsfaces/component/dataTable/DataTable.java b/src/main/java/net/bootsfaces/component/dataTable/DataTable.java
@@ -26,17 +26,15 @@
 import java.util.Map;
 
 import javax.el.ValueExpression;
-import javax.faces.application.ResourceDependencies;
-import javax.faces.application.ResourceDependency;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
 import javax.faces.component.UIViewRoot;
 import javax.faces.component.behavior.ClientBehaviorHolder;
 import javax.faces.context.FacesContext;
 import javax.faces.event.FacesEvent;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.component.ajax.IAJAXComponent;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;

diff --git a/src/main/java/net/bootsfaces/component/dataTableColumn/DataTableColumn.java b/src/main/java/net/bootsfaces/component/dataTableColumn/DataTableColumn.java
@@ -20,8 +20,8 @@
 
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.utils.BsfUtils;
 

diff --git a/src/main/java/net/bootsfaces/component/dataTableColumn/DataTableColumnCore.java b/src/main/java/net/bootsfaces/component/dataTableColumn/DataTableColumnCore.java
@@ -18,8 +18,7 @@
 
 package net.bootsfaces.component.dataTableColumn;
 
-import javax.faces.component.*;
-import net.bootsfaces.utils.BsfUtils;
+import javax.faces.component.UIColumn;
 
 /** This class holds the attributes of &lt;b:dataTableColumn /&gt;. */
 public abstract class DataTableColumnCore extends UIColumn {

diff --git a/src/main/java/net/bootsfaces/component/dropButton/DropButton.java b/src/main/java/net/bootsfaces/component/dropButton/DropButton.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponentBase;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.IHasTooltip;

diff --git a/src/main/java/net/bootsfaces/component/dropMenu/DropMenu.java b/src/main/java/net/bootsfaces/component/dropMenu/DropMenu.java
@@ -22,9 +22,8 @@
 import javax.faces.application.ResourceDependencies;
 import javax.faces.application.ResourceDependency;
 import javax.faces.component.FacesComponent;
-import javax.faces.component.UIComponentBase;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.IHasTooltip;

diff --git a/src/main/java/net/bootsfaces/component/dropMenu/DropMenuRenderer.java b/src/main/java/net/bootsfaces/component/dropMenu/DropMenuRenderer.java
@@ -123,7 +123,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 				rw.writeText(value, null);
 			}
 			// Encode Caret
-			if ((!isFlyOutMenu) && (!(dropMenu.getParent() instanceof DropMenu))) {
+			if ((!isFlyOutMenu) && (!isDropMenuChild(dropMenu))) {
 				rw.startElement("b", dropMenu);
 				rw.writeAttribute("class", "caret", "class");
 				rw.endElement("b");
@@ -134,6 +134,16 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
 		encodeDropMenuStart(dropMenu, rw, "dtL" + clientId);
 	}
 
+	private boolean isDropMenuChild(UIComponent component) {
+		UIComponent parent = component.getParent();
+		if (parent != null) {
+			while (parent.getClass().getSimpleName().equals("UIRepeat")) {
+				parent = parent.getParent();
+			}
+		}	
+		return parent instanceof DropMenu;
+	}
+
 	private String determineHtmlTag(UIComponent component, boolean isFlyOutMenu) {
 		String htmlTag = "span";
 		if (isFlyOutMenu) {
@@ -178,7 +188,7 @@ private String getStyleClass(DropMenu dropMenu, boolean isFlyOutMenu) {
 		if (isFlyOutMenu) {
 			userClass += "dropdown-submenu" + " ";
 			return userClass;
-		} else if (dropMenu.getParent() instanceof DropMenu) {
+		} else if (isDropMenuChild(dropMenu)) {
 			userClass += "dropdown-submenu" + " ";
 		}
 		return (userClass + "drop" + direction).trim();

diff --git a/src/main/java/net/bootsfaces/component/fetchBeanInfos/FetchBeanInfos.java b/src/main/java/net/bootsfaces/component/fetchBeanInfos/FetchBeanInfos.java
@@ -22,7 +22,6 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
 
 import net.bootsfaces.C;
 import net.bootsfaces.utils.BsfUtils;

diff --git a/src/main/java/net/bootsfaces/component/flyOutMenu/FlyOutMenu.java b/src/main/java/net/bootsfaces/component/flyOutMenu/FlyOutMenu.java
@@ -21,8 +21,8 @@
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIOutput;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IContentDisabled;
 import net.bootsfaces.render.Tooltip;

diff --git a/src/main/java/net/bootsfaces/component/focus/Focus.java b/src/main/java/net/bootsfaces/component/focus/Focus.java
@@ -6,7 +6,6 @@
 import javax.el.ValueExpression;
 import javax.faces.FacesException;
 import javax.faces.component.FacesComponent;
-import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;

diff --git a/src/main/java/net/bootsfaces/component/form/FormCore.java b/src/main/java/net/bootsfaces/component/form/FormCore.java
@@ -18,8 +18,7 @@
 
 package net.bootsfaces.component.form;
 
-import javax.faces.component.*;
-import net.bootsfaces.utils.BsfUtils;
+import javax.faces.component.UIForm;
 
 /** This class holds the attributes of &lt;b:form /&gt;. */
 public abstract class FormCore extends UIForm {

diff --git a/src/main/java/net/bootsfaces/component/formGroup/FormGroup.java b/src/main/java/net/bootsfaces/component/formGroup/FormGroup.java
@@ -18,6 +18,7 @@
 package net.bootsfaces.component.formGroup;
 
 import javax.faces.component.FacesComponent;
+
 import net.bootsfaces.C;
 import net.bootsfaces.component.row.Row;
 

diff --git a/src/main/java/net/bootsfaces/component/formGroup/FormGroupRenderer.java b/src/main/java/net/bootsfaces/component/formGroup/FormGroupRenderer.java
@@ -18,10 +18,12 @@
 package net.bootsfaces.component.formGroup;
 
 import java.io.IOException;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.FacesRenderer;
+
 import net.bootsfaces.C;
 import net.bootsfaces.render.CoreRenderer;
 import net.bootsfaces.render.IContentDisabled;

diff --git a/src/main/java/net/bootsfaces/component/fullCalendar/FullCalendar.java b/src/main/java/net/bootsfaces/component/fullCalendar/FullCalendar.java
@@ -4,8 +4,8 @@
 import javax.faces.application.ResourceDependencies;
 import javax.faces.application.ResourceDependency;
 import javax.faces.component.FacesComponent;
-import net.bootsfaces.C;
 
+import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.Tooltip;
 import net.bootsfaces.utils.BsfUtils;

diff --git a/src/main/java/net/bootsfaces/component/growl/Growl.java b/src/main/java/net/bootsfaces/component/growl/Growl.java
@@ -19,6 +19,7 @@
 
 import javax.el.ValueExpression;
 import javax.faces.component.FacesComponent;
+
 import net.bootsfaces.C;
 import net.bootsfaces.component.UIMessagesBase;
 import net.bootsfaces.listeners.AddResourcesListener;