diff options
author | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-28 11:56:47 +0300 |
---|---|---|
committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-28 11:58:23 +0300 |
commit | b53f5dddf13ba28385e9853c57d5d3074832a6be (patch) | |
tree | 607bab6d2ca94bbf80f16c91219214cfe48c25ea | |
parent | cb2c9d684dd107d4a181c6a432b5fbf69cde6d47 (diff) | |
download | vaadin-framework-b53f5dddf13ba28385e9853c57d5d3074832a6be.tar.gz vaadin-framework-b53f5dddf13ba28385e9853c57d5d3074832a6be.zip |
Rename registerProvider, unregisterProvider to addProvider and removeProvider for consistency (#9416)
-rw-r--r-- | server/src/com/vaadin/navigator/Navigator.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java index 9a937d5750..b39b98e9fa 100644 --- a/server/src/com/vaadin/navigator/Navigator.java +++ b/server/src/com/vaadin/navigator/Navigator.java @@ -1,7 +1,7 @@ package com.vaadin.navigator; /* - * Copyright 2011 Vaadin Ltd. + * Copyright 2011 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -67,7 +67,7 @@ public class Navigator implements Serializable { } @Override - public void navigateTo(String fragmentParameters) { + public void enter(String fragmentParameters) { // nothing to do } } @@ -113,7 +113,7 @@ public class Navigator implements Serializable { @Override public void fragmentChanged(FragmentChangedEvent event) { - UriFragmentManager.this.navigator.navigateTo(getFragment()); + navigator.navigateTo(getFragment()); } } @@ -477,7 +477,7 @@ public class Navigator implements Serializable { } } - view.navigateTo(fragmentParameters); + view.enter(fragmentParameters); currentView = view; if (display != null) { @@ -564,7 +564,7 @@ public class Navigator implements Serializable { } removeView(viewName); - registerProvider(new StaticViewProvider(viewName, view)); + addProvider(new StaticViewProvider(viewName, view)); } /** @@ -590,7 +590,7 @@ public class Navigator implements Serializable { } removeView(viewName); - registerProvider(new ClassBasedViewProvider(viewName, viewClass)); + addProvider(new ClassBasedViewProvider(viewName, viewClass)); } /** @@ -629,7 +629,7 @@ public class Navigator implements Serializable { * @param provider * provider to register */ - public void registerProvider(ViewProvider provider) { + public void addProvider(ViewProvider provider) { providers.add(provider); } @@ -639,7 +639,7 @@ public class Navigator implements Serializable { * @param provider * provider to unregister */ - public void unregisterProvider(ViewProvider provider) { + public void removeProvider(ViewProvider provider) { providers.remove(provider); } |