From c9ecf03d0367e867927768f5a16ba2a5a00d1af2 Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Thu, 28 Sep 2017 17:20:27 +0200 Subject: [PATCH] renaming RegistrationWorkflowView to RegistrationWorksetView --- ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch | 2 +- .../vaadin/component/registration/RegistrationItem.java | 4 ++-- ...resenter.java => RegistrationWorkingsetPresenter.java} | 4 ++-- ...nWorkflowView.java => RegistrationWorkingsetView.java} | 2 +- ...flowViewBean.java => RegistrationWorksetViewBean.java} | 8 ++++---- .../view/registration/StartRegistrationPresenter.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/{RegistrationWorkflowPresenter.java => RegistrationWorkingsetPresenter.java} (99%) rename src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/{RegistrationWorkflowView.java => RegistrationWorkingsetView.java} (97%) rename src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/{RegistrationWorkflowViewBean.java => RegistrationWorksetViewBean.java} (98%) diff --git a/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch b/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch index bb252acd..aab47645 100644 --- a/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch +++ b/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch @@ -54,5 +54,5 @@ - + diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItem.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItem.java index 0f87d5c5..4f57fa2c 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItem.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItem.java @@ -38,7 +38,7 @@ import eu.etaxonomy.cdm.vaadin.util.formatter.DateTimeFormat; import eu.etaxonomy.cdm.vaadin.util.formatter.TimePeriodFormatter; import eu.etaxonomy.cdm.vaadin.view.registration.RegistrationDTO; import eu.etaxonomy.cdm.vaadin.view.registration.RegistrationTypeConverter; -import eu.etaxonomy.cdm.vaadin.view.registration.RegistrationWorkflowViewBean; +import eu.etaxonomy.cdm.vaadin.view.registration.RegistrationWorksetViewBean; import eu.etaxonomy.vaadin.mvp.AbstractView; import eu.etaxonomy.vaadin.ui.navigation.NavigationEvent; @@ -168,7 +168,7 @@ public class RegistrationItem extends GridLayout { NavigationEvent navigationEvent = null; if(regDto.getCitationID() != null) { navigationEvent = new NavigationEvent( - RegistrationWorkflowViewBean.NAME, + RegistrationWorksetViewBean.NAME, Integer.toString(regDto.getCitationID()) ); } else { diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkflowPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java similarity index 99% rename from src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkflowPresenter.java rename to src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java index 2ec54891..c33f58e5 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkflowPresenter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java @@ -56,7 +56,7 @@ import eu.etaxonomy.vaadin.ui.view.DoneWithPopupEvent.Reason; */ @SpringComponent @ViewScope -public class RegistrationWorkflowPresenter extends AbstractPresenter { +public class RegistrationWorkingsetPresenter extends AbstractPresenter { private static final long serialVersionUID = 1L; @@ -81,7 +81,7 @@ public class RegistrationWorkflowPresenter extends AbstractPresenter - implements RegistrationWorkflowView, View, AccessRestrictedView { +@SpringView(name=RegistrationWorksetViewBean.NAME) +public class RegistrationWorksetViewBean extends AbstractPageView + implements RegistrationWorkingsetView, View, AccessRestrictedView { public static final String DOM_ID_WORKINGSET = "workingset"; @@ -101,7 +101,7 @@ public class RegistrationWorkflowViewBean extends AbstractPageView