Refactoring

Author: javier-godoy

src/main/java/com/flowingcode/addons/applayout/AppHeader.java

@@ -64,18 +64,6 @@ public AppToolbar getAppToolbar() {
     	return appToolbar;
     }
 
-    public void addToolbarIconButtons(Component... components) {
-		appToolbar.addToolbarIconButtons(components);
-	}
-	
-	public void clearToolbarIconButtons(Component... components) {
-		appToolbar.addToolbarIconButtons(components);
-	}
-
-	public void setMenuIconVisible(boolean visible) {
-		appToolbar.setMenuIconVisible(visible);
-	}
-
 	/**Mantains the header fixed at the top so it never moves away.*/
 	public void setFixed(boolean fixed) {
 		this.getElement().setAttribute("fixed", fixed);

src/main/java/com/flowingcode/addons/applayout/AppLayout.java

@@ -94,21 +94,25 @@ public void clearMenuItems() {
 	}
 
 	public void setToolbarIconButtons(Component... components) {
-		header.clearToolbarIconButtons();
-		header.addToolbarIconButtons(components);		
+		header.getAppToolbar().clearToolbarIconButtons();
+		header.getAppToolbar().addToolbarIconButtons(components);
 	}
 
 	public void addToolbarIconButtons(Component... components) {
-		header.addToolbarIconButtons(components);
+		header.getAppToolbar().addToolbarIconButtons(components);
 	}
-	
+
+	public void addToolbarIconButtonAsFirst(Component component) {
+		header.getAppToolbar().addToolbarIconButtonAsFirst(component);
+	}
+
 	public void clearToolbarIconButtons() {
-		header.clearToolbarIconButtons();
+		header.getAppToolbar().clearToolbarIconButtons();
 	}
 
 	public void setMenuVisible(boolean visible) {
 		drawer.setVisible(visible);
-		header.setMenuIconVisible(visible);
+		header.getAppToolbar().setMenuIconVisible(visible);
 	}
 
 	public boolean isMenuVisible() {

src/main/java/com/flowingcode/addons/applayout/AppToolbar.java

@@ -22,13 +22,14 @@
 
 
 import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.HasComponents;
+import com.vaadin.flow.component.HasOrderedComponents;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.HtmlImport;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Image;
+import com.vaadin.flow.dom.Element;
 
 /**
  * Component that renders the app toolbar
@@ -44,47 +45,87 @@
 @JsModule("@polymer/app-layout/app-toolbar/app-toolbar.js")
 @JsModule("@polymer/iron-icons/iron-icons.js")
 @Tag("app-toolbar")
-public class AppToolbar extends Component implements HasComponents {
+public class AppToolbar extends Component {
 
 	private ToolbarIconButton menu;
-	private Component ctitle;
 	private Div divTitle;
+	private int index;
+
+	private HasOrderedComponents<AppToolbar> hasOrderedComponents = new HasOrderedComponents<AppToolbar>() {
+		@Override
+		public Element getElement() {
+			return AppToolbar.this.getElement();
+		}
+
+		@Override
+		public int getComponentCount() {
+			return (int) getChildren().count();
+		};
+
+		@Override
+		public Component getComponentAt(int index) {
+	        if (index < 0) {
+	            throw new IllegalArgumentException(
+	                    "The 'index' argument should be greater than or equal to 0. It was: "
+	                            + index);
+	        }
+	        return getChildren().sequential().skip(index).findFirst()
+	                .orElseThrow(() -> new IllegalArgumentException(
+	                        "The 'index' argument should not be greater than or equals to the number of children components. It was: "
+	                                + index));
+	    };
+
+	};
 
     public AppToolbar(String title, AppDrawer drawer) {
     	this(null,title, drawer);
     }
 
     public AppToolbar(Image logo, String title, AppDrawer drawer) {
-    	menu = new ToolbarIconButton().setIcon("menu");    	
+    	menu = new ToolbarIconButton().setIcon("menu");
+    	add(menu);
+
     	drawer.getId().ifPresent(id -> menu.getElement().setAttribute("onclick", id + ".toggle()"));
     	if (logo!=null) {
-    		ctitle = logo;
+    		add(logo);
     	}
+
     	divTitle = new Div();
-    	divTitle.getElement().setAttribute("main-title", true);    	
+    	divTitle.getElement().setAttribute("main-title", true);
     	setTitle(title);
-    	
-    	clearToolbarIconButtons();
+    	add(divTitle);
+
+    	index = hasOrderedComponents.getComponentCount();
+    }
+
+    private void add(Component... components) {
+    	hasOrderedComponents.add(components);
+    }
+
+    private void addComponentAtIndex(int index, Component component) {
+    	hasOrderedComponents.addComponentAtIndex(index, component);
     }
 
     public void setTitle(String title) {
     	divTitle.setText(title);
     }
 
 	public void clearToolbarIconButtons() {
-		this.removeAll();
-		this.add(menu);
-		if (ctitle!=null) this.add(ctitle);
-		if (divTitle!=null) this.add(divTitle);
+		while (hasOrderedComponents.getComponentCount()>index) {
+			hasOrderedComponents.remove(hasOrderedComponents.getComponentAt(index));
+		}
 	}
-	
-	public void addToolbarIconButtons(Component... components) {
-		this.add(components);		
-	}
-	
+
 	public void setMenuIconVisible(boolean visible) {
 		menu.setVisible(visible);
 	}
 
+	public void addToolbarIconButtons(Component... components) {
+		this.add(components);
+	}
+
+	public void addToolbarIconButtonAsFirst(Component component) {
+		this.addComponentAtIndex(index, component);
+	}
 
 }