Skip to content
This repository has been archived by the owner on May 5, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Artur- committed Jun 12, 2017
1 parent 9b74111 commit 85e86cc
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 178 deletions.
9 changes: 6 additions & 3 deletions pom.xml
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.1.RELEASE</version>
<version>1.5.4.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

Expand All @@ -28,22 +28,25 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>8.0.0</version>
<version>8.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
24 changes: 0 additions & 24 deletions src/main/java/org/vaadin/spring/tutorial/DefaultView.java

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/java/org/vaadin/spring/tutorial/Greeter.java

This file was deleted.

50 changes: 10 additions & 40 deletions src/main/java/org/vaadin/spring/tutorial/MyUI.java
@@ -1,59 +1,29 @@
package org.vaadin.spring.tutorial;

import com.vaadin.annotations.Theme;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewDisplay;
import com.vaadin.server.VaadinRequest;
import com.vaadin.spring.annotation.SpringUI;
import com.vaadin.spring.annotation.SpringViewDisplay;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;

@Theme("valo")
@SpringUI
@SpringViewDisplay
public class MyUI extends UI implements ViewDisplay {
public class MyUI extends UI {

private Panel springViewDisplay;
public static class TestObject {

}

@Override
protected void init(VaadinRequest request) {
// Note that getSession() returns VaadinSession, not the underlying HTTP
// session. Use getSession().getSession() to get the wrapped HTTP
// session
getSession().setAttribute("not.serializable", new TestObject());
final VerticalLayout root = new VerticalLayout();
root.setSizeFull();
setContent(root);

final CssLayout navigationBar = new CssLayout();
navigationBar.addStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
navigationBar.addComponent(createNavigationButton("UI Scoped View",
UIScopedView.VIEW_NAME));
navigationBar.addComponent(createNavigationButton("View Scoped View",
ViewScopedView.VIEW_NAME));
root.addComponent(navigationBar);

springViewDisplay = new Panel();
springViewDisplay.setSizeFull();
root.addComponent(springViewDisplay);
root.setExpandRatio(springViewDisplay, 1.0f);
root.addComponent(new Label("Good, now reload the app"));
}

private Button createNavigationButton(String caption,
final String viewName) {
Button button = new Button(caption);
button.addStyleName(ValoTheme.BUTTON_SMALL);
// If you didn't choose Java 8 when creating the project, convert this
// to an anonymous listener class
button.addClickListener(
event -> getUI().getNavigator().navigateTo(viewName));
return button;
}

@Override
public void showView(View view) {
springViewDisplay.setContent((Component) view);
}
}
33 changes: 0 additions & 33 deletions src/main/java/org/vaadin/spring/tutorial/UIScopedView.java

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/java/org/vaadin/spring/tutorial/ViewGreeter.java

This file was deleted.

36 changes: 0 additions & 36 deletions src/main/java/org/vaadin/spring/tutorial/ViewScopedView.java

This file was deleted.

This file was deleted.

0 comments on commit 85e86cc

Please sign in to comment.