Commit e58d440f by Antti Tönkyrä

uppercasifying fixes

1 parent 354ae6de
...@@ -30,9 +30,9 @@ import fi.insomnia.bortal.model.MenuNavigation; ...@@ -30,9 +30,9 @@ import fi.insomnia.bortal.model.MenuNavigation;
@Stateless @Stateless
@LocalBean @LocalBean
@DeclareRoles(SpecialPermission.S_SUPERADMIN) @DeclareRoles(SpecialPermission.S_SUPERADMIN)
public class Menubean implements MenubeanLocal { public class MenuBean implements MenuBeanLocal {
public Menubean() { public MenuBean() {
} }
@EJB @EJB
...@@ -48,7 +48,7 @@ public class Menubean implements MenubeanLocal { ...@@ -48,7 +48,7 @@ public class Menubean implements MenubeanLocal {
private PermissionBeanLocal permbean; private PermissionBeanLocal permbean;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(Menubean.class); private static final Logger logger = LoggerFactory.getLogger(MenuBean.class);
@RolesAllowed(SpecialPermission.S_SUPERADMIN) @RolesAllowed(SpecialPermission.S_SUPERADMIN)
@Override @Override
......
...@@ -7,7 +7,7 @@ import javax.ejb.Local; ...@@ -7,7 +7,7 @@ import javax.ejb.Local;
import fi.insomnia.bortal.model.MenuNavigation; import fi.insomnia.bortal.model.MenuNavigation;
@Local @Local
public interface MenubeanLocal { public interface MenuBeanLocal {
// List<MenuNavigation> getTopnavigations(); // List<MenuNavigation> getTopnavigations();
......
...@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; ...@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal; import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.MenubeanLocal; import fi.insomnia.bortal.beans.MenuBeanLocal;
import fi.insomnia.bortal.beans.PollBeanLocal; import fi.insomnia.bortal.beans.PollBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.beans.TestDataBeanLocal; import fi.insomnia.bortal.beans.TestDataBeanLocal;
...@@ -52,7 +52,7 @@ public class TestDataView { ...@@ -52,7 +52,7 @@ public class TestDataView {
@EJB @EJB
private PollBeanLocal pollbean; private PollBeanLocal pollbean;
@EJB @EJB
private MenubeanLocal menubean; private MenuBeanLocal menubean;
public void convertUsernames() { public void convertUsernames() {
......
...@@ -11,7 +11,7 @@ import org.primefaces.model.TreeNode; ...@@ -11,7 +11,7 @@ import org.primefaces.model.TreeNode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.MenubeanLocal; import fi.insomnia.bortal.beans.MenuBeanLocal;
import fi.insomnia.bortal.enums.apps.ContentPermission; import fi.insomnia.bortal.enums.apps.ContentPermission;
import fi.insomnia.bortal.model.MenuNavigation; import fi.insomnia.bortal.model.MenuNavigation;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -24,7 +24,7 @@ public class MenuListView extends GenericCDIView { ...@@ -24,7 +24,7 @@ public class MenuListView extends GenericCDIView {
private static final Logger logger = LoggerFactory.getLogger(MenuListView.class); private static final Logger logger = LoggerFactory.getLogger(MenuListView.class);
@EJB @EJB
private transient MenubeanLocal menubean; private transient MenuBeanLocal menubean;
private TreeNode selectedNode; private TreeNode selectedNode;
private TreeNode root; private TreeNode root;
......
...@@ -15,7 +15,7 @@ import javax.inject.Named; ...@@ -15,7 +15,7 @@ import javax.inject.Named;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.MenubeanLocal; import fi.insomnia.bortal.beans.MenuBeanLocal;
import fi.insomnia.bortal.beans.SitePageBeanLocal; import fi.insomnia.bortal.beans.SitePageBeanLocal;
import fi.insomnia.bortal.model.MenuNavigation; import fi.insomnia.bortal.model.MenuNavigation;
import fi.insomnia.bortal.model.PageContent; import fi.insomnia.bortal.model.PageContent;
...@@ -37,7 +37,7 @@ public class MenuView extends GenericCDIView { ...@@ -37,7 +37,7 @@ public class MenuView extends GenericCDIView {
private transient FacesContext context; private transient FacesContext context;
@EJB @EJB
private transient MenubeanLocal menubean; private transient MenuBeanLocal menubean;
private LinkedList<List<JsfMenuitem>> menus; private LinkedList<List<JsfMenuitem>> menus;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!