aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/navigator
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-07-23 15:23:43 +0300
committerLeif Åstrand <leif@vaadin.com>2012-07-23 15:23:43 +0300
commit3604bf01ded16d21041cbb655632429e00c94639 (patch)
tree9bf7ae9d3a33e6b672c164e696a24aef08ebc13e /src/com/vaadin/navigator
parentb7982bac6d8bca02fc76c9974ffd1c24d9a06f04 (diff)
downloadvaadin-framework-3604bf01ded16d21041cbb655632429e00c94639.tar.gz
vaadin-framework-3604bf01ded16d21041cbb655632429e00c94639.zip
Add Java 6 @Override annotations to all methods from interfaces
Diffstat (limited to 'src/com/vaadin/navigator')
-rw-r--r--src/com/vaadin/navigator/Navigator.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/vaadin/navigator/Navigator.java b/src/com/vaadin/navigator/Navigator.java
index c5e7de836a..1813301fe6 100644
--- a/src/com/vaadin/navigator/Navigator.java
+++ b/src/com/vaadin/navigator/Navigator.java
@@ -54,6 +54,7 @@ public class Navigator implements Serializable {
setHeight("0px");
}
+ @Override
public void navigateTo(String fragmentParameters) {
// nothing to do
}
@@ -88,14 +89,17 @@ public class Navigator implements Serializable {
page.addListener(this);
}
+ @Override
public String getFragment() {
return page.getFragment();
}
+ @Override
public void setFragment(String fragment) {
page.setFragment(fragment, false);
}
+ @Override
public void fragmentChanged(FragmentChangedEvent event) {
UriFragmentManager.this.navigator.navigateTo(getFragment());
}
@@ -122,6 +126,7 @@ public class Navigator implements Serializable {
setSizeFull();
}
+ @Override
public void showView(View view) {
if (view instanceof Component) {
setCompositionRoot((Component) view);
@@ -155,6 +160,7 @@ public class Navigator implements Serializable {
this.container = container;
}
+ @Override
public void showView(View view) {
if (view instanceof Component) {
container.removeAllComponents();
@@ -190,6 +196,7 @@ public class Navigator implements Serializable {
this.view = view;
}
+ @Override
public String getViewName(String viewAndParameters) {
if (null == viewAndParameters) {
return null;
@@ -200,6 +207,7 @@ public class Navigator implements Serializable {
return null;
}
+ @Override
public View getView(String viewName) {
if (this.viewName.equals(viewName)) {
return view;
@@ -250,6 +258,7 @@ public class Navigator implements Serializable {
this.viewClass = viewClass;
}
+ @Override
public String getViewName(String viewAndParameters) {
if (null == viewAndParameters) {
return null;
@@ -261,6 +270,7 @@ public class Navigator implements Serializable {
return null;
}
+ @Override
public View getView(String viewName) {
if (this.viewName.equals(viewName)) {
try {