Skip to content

Commit 2a57e4d

Browse files
committed
Merge branch 'master' of github.com:FlowingCode/AppLayoutAddon
2 parents c704aa4 + 1b3b874 commit 2a57e4d

File tree

17 files changed

+47
-51
lines changed

17 files changed

+47
-51
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
<version>1.14</version>
137137
<configuration>
138138
<licenseName>apache_v2</licenseName>
139+
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
139140
</configuration>
140141
</plugin>
141142

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,10 +17,12 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323

2424
import java.util.ArrayList;
25-
import java.util.Arrays;
25+
import java.util.Collections;
2626
import java.util.List;
2727

2828
import com.flowingcode.addons.applayout.menu.MenuItem;
@@ -43,7 +43,7 @@
4343
@HtmlImport("bower_components/app-layout/app-drawer/app-drawer.html")
4444
public class AppDrawer extends Component implements HasComponents {
4545

46-
private PaperListbox pm = new PaperListbox(Arrays.asList(new Component[] {}));
46+
private PaperListbox pm = new PaperListbox(Collections.emptyList());
4747
private Component header;
4848

4949
public AppDrawer(String title) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,6 +17,8 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323

2424
import com.flowingcode.addons.applayout.menu.MenuItem;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,6 +17,8 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323
import java.util.ArrayList;
2424

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,6 +17,8 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323

2424
import java.util.ArrayList;
@@ -75,10 +75,10 @@ public void setToolbarIconButtons(MenuItem[] menuItems) {
7575
this.add(menu);
7676
if (ctitle!=null) this.add(ctitle);
7777
if (divTitle!=null) this.add(divTitle);
78-
toolbarIconButtons.forEach(tib->this.add(tib));
78+
toolbarIconButtons.forEach(this::add);
7979
}
8080

81-
private List<PaperIconButton> createToolbarIconButtons(MenuItem[] menuItems) {
81+
private static List<PaperIconButton> createToolbarIconButtons(MenuItem[] menuItems) {
8282
List<PaperIconButton> result = new ArrayList<>();
8383
for (MenuItem menuItem : menuItems) {
8484
PaperIconButton paperIconButton = new PaperIconButton(menuItem.getIcon(),menuItem.getCommand());

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
3-
import java.net.URL;
4-
51
/*-
62
* #%L
73
* App Layout Addon
@@ -21,8 +17,12 @@
2117
* limitations under the License.
2218
* #L%
2319
*/
20+
package com.flowingcode.addons.applayout;
21+
2422

2523

24+
import java.net.URL;
25+
2626
import com.vaadin.flow.component.Component;
2727
import com.vaadin.flow.component.HasComponents;
2828
import com.vaadin.flow.component.HasSize;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
3-
import java.net.URL;
4-
51
/*-
62
* #%L
73
* App Layout Addon
@@ -21,8 +17,12 @@
2117
* limitations under the License.
2218
* #L%
2319
*/
20+
package com.flowingcode.addons.applayout;
21+
2422

2523

24+
import java.net.URL;
25+
2626
import com.vaadin.flow.component.Component;
2727
import com.vaadin.flow.component.HasSize;
2828
import com.vaadin.flow.component.HasText;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,6 +17,8 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323

2424
import com.vaadin.flow.component.Component;
@@ -43,9 +43,7 @@ public PaperButton(String label) {
4343

4444
public PaperButton(String label, Command command) {
4545
this.setLabel(label);
46-
this.getElement().addEventListener("click", e->{
47-
command.execute();
48-
});
46+
this.getElement().addEventListener("click", e->command.execute());
4947
}
5048

5149
public void setLabel(String label) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,6 +17,8 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323

2424
import java.util.ArrayList;
@@ -87,7 +87,7 @@ public void setCardActions(final MenuItem... cardActions) {
8787
final Div inner = new Div();
8888
cardActionsDiv.add(inner);
8989
inner.addClassNames("horizontal", "justified");
90-
buttons.forEach(b -> inner.add(b));
90+
buttons.forEach(inner::add);
9191
hasComponentsVersion.add(cardActionsDiv);
9292
}
9393
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package com.flowingcode.addons.applayout;
2-
31
/*-
42
* #%L
53
* App Layout Addon
@@ -19,6 +17,8 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package com.flowingcode.addons.applayout;
21+
2222

2323

2424
import com.vaadin.flow.component.Component;
@@ -44,9 +44,7 @@ public PaperIconButton(String icon) {
4444

4545
public PaperIconButton(String icon, Command command) {
4646
this.setIcon(icon);
47-
this.getElement().addEventListener("click", e->{
48-
command.execute();
49-
});
47+
this.getElement().addEventListener("click", e->command.execute());
5048
}
5149

5250
public void setIcon(String icon) {

0 commit comments

Comments
 (0)