You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/05/22 16:06:01 UTC
svn commit: r777531 -
/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Author: vkumar
Date: Fri May 22 14:06:00 2009
New Revision: 777531
URL: http://svn.apache.org/viewvc?rev=777531&view=rev
Log:
Validation for null check in menu objects
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=777531&r1=777530&r2=777531&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java Fri May 22 14:06:00 2009
@@ -4020,12 +4020,12 @@
getPortletRequest().getPortletSession().setAttribute("menuDefinition", menuDefinition);
}
- protected void menuActions(String action, String options,OptionsDefinitionBean element)
+ protected void menuActions(String action, String options, OptionsDefinitionBean element)
{
SiteTreeNode node = getUserSelectedNode();
MenuDefinition definition = getMenuDefinition();
MenuOptionsDefinition oldElement = getOptionsDefinition(options);
- MenuOptionsDefinition newElement = getOptionsDefinition(element);
+ MenuOptionsDefinition newElement = getOptionsDefinition(element);
if (node.getDocType() == FileType.Folder)
{
Folder folder = getJetspeedFolder(node.getNodePath());
@@ -4033,10 +4033,18 @@
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4044,17 +4052,26 @@
}
folder.setMenuDefinitions(menuList);
folderAction(folder, SAVE_ACTION);
- } else if (node.getDocType() == FileType.Page)
+ }
+ else if (node.getDocType() == FileType.Page)
{
Page page = getJetspeedPage(node.getNodePath());
List menuList = page.getMenuDefinitions();
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4067,31 +4084,36 @@
getMenuElements(definition, MenuElement.OPTION_ELEMENT_TYPE);
}
- protected void menuActions(String action,String name, JetspeedMenuDefinition element)
+ protected void menuActions(String action, String name, JetspeedMenuDefinition element)
{
- MenuDefinition oldElement = getDefinition(name);
+ MenuDefinition oldElement = getDefinition(name);
SiteTreeNode node = getUserSelectedNode();
- MenuDefinition newElement = getMenuDefinition(document.getType(),element);
- newElement.getMenuElements().addAll(oldElement.getMenuElements());
+ MenuDefinition newElement = getMenuDefinition(document.getType(), element);
+ if (oldElement != null && oldElement.getMenuElements() != null)
+ {
+ newElement.setMenuElements(oldElement.getMenuElements());
+ }
if (node.getDocType() == FileType.Folder)
{
-
Folder folder = getJetspeedFolder(node.getNodePath());
List menuList = folder.getMenuDefinitions();
if (action.equals(SAVE_ACTION))
{
menuList.remove(oldElement);
menuList.add(newElement);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(oldElement);
- } else if (action.equals(ADD_ACTION))
+ }
+ else if (action.equals(ADD_ACTION))
{
menuList.add(newElement);
}
folder.setMenuDefinitions(menuList);
folderAction(folder, SAVE_ACTION);
- } else if (node.getDocType() == FileType.Page)
+ }
+ else if (node.getDocType() == FileType.Page)
{
Page page = getJetspeedPage(node.getNodePath());
List menuList = page.getMenuDefinitions();
@@ -4099,10 +4121,12 @@
{
menuList.remove(oldElement);
menuList.add(newElement);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(oldElement);
- } else if (action.equals(ADD_ACTION))
+ }
+ else if (action.equals(ADD_ACTION))
{
menuList.add(newElement);
}
@@ -4112,12 +4136,12 @@
setMenuDefinition(newElement);
}
- protected void menuActions(String action,String name,SeparatorDefinitionBean element)
+ protected void menuActions(String action, String name, SeparatorDefinitionBean element)
{
SiteTreeNode node = getUserSelectedNode();
MenuDefinition definition = getMenuDefinition();
MenuSeparatorDefinition oldElement = getSeparatorDefinition(element.getText());
- MenuSeparatorDefinition newElement = getSeparatorDefinition(element);
+ MenuSeparatorDefinition newElement = getSeparatorDefinition(element);
if (node.getDocType() == FileType.Folder)
{
Folder folder = getJetspeedFolder(node.getNodePath());
@@ -4125,10 +4149,18 @@
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4136,17 +4168,26 @@
}
folder.setMenuDefinitions(menuList);
folderAction(folder, SAVE_ACTION);
- } else if (node.getDocType() == FileType.Page)
+ }
+ else if (node.getDocType() == FileType.Page)
{
Page page = getJetspeedPage(node.getNodePath());
List menuList = page.getMenuDefinitions();
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4159,12 +4200,12 @@
getMenuElements(definition, MenuElement.SEPARATOR_ELEMENT_TYPE);
}
- protected void menuActions(String action,String name,IncludesDefinitionBean element)
+ protected void menuActions(String action, String name, IncludesDefinitionBean element)
{
SiteTreeNode node = getUserSelectedNode();
MenuDefinition definition = getMenuDefinition();
MenuIncludeDefinition oldElement = getIncludesDefinition(name);
- MenuIncludeDefinition newElement = getIncludesDefinition(element);
+ MenuIncludeDefinition newElement = getIncludesDefinition(element);
if (node.getDocType() == FileType.Folder)
{
Folder folder = getJetspeedFolder(node.getNodePath());
@@ -4172,10 +4213,18 @@
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4183,17 +4232,26 @@
}
folder.setMenuDefinitions(menuList);
folderAction(folder, SAVE_ACTION);
- } else if (node.getDocType() == FileType.Page)
+ }
+ else if (node.getDocType() == FileType.Page)
{
Page page = getJetspeedPage(node.getNodePath());
List menuList = page.getMenuDefinitions();
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4206,7 +4264,7 @@
getMenuElements(definition, INCLUDES);
}
- protected void menuActions(String action,String name,ExcludesDefinitionBean element)
+ protected void menuActions(String action, String name, ExcludesDefinitionBean element)
{
SiteTreeNode node = getUserSelectedNode();
MenuDefinition definition = getMenuDefinition();
@@ -4219,10 +4277,18 @@
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4230,17 +4296,26 @@
}
folder.setMenuDefinitions(menuList);
folderAction(folder, SAVE_ACTION);
- } else if (node.getDocType() == FileType.Page)
+ }
+ else if (node.getDocType() == FileType.Page)
{
Page page = getJetspeedPage(node.getNodePath());
List menuList = page.getMenuDefinitions();
if (action.equals(SAVE_ACTION))
{
menuList.remove(definition);
- definition.getMenuElements().remove(oldElement);
- definition.getMenuElements().add(newElement);
+ if(definition.getMenuElements()!=null)
+ {
+ definition.getMenuElements().remove(oldElement);
+ definition.getMenuElements().add(newElement);
+ }else{
+ List elements = new ArrayList();
+ elements.add(newElement);
+ definition.setMenuElements(elements);
+ }
menuList.add(definition);
- } else if (action.equals(REMOVE_ACTION))
+ }
+ else if (action.equals(REMOVE_ACTION))
{
menuList.remove(definition);
definition.getMenuElements().remove(oldElement);
@@ -4537,65 +4612,77 @@
private MenuOptionsDefinition getOptionsDefinition(String options)
{
List elements = getMenuDefinition().getMenuElements();
- for(int index=0;index<elements.size();index++)
+ if (elements != null)
{
- Object element = elements.get(index);
- if(element instanceof MenuOptionsDefinition)
+ for (int index = 0; index < elements.size(); index++)
{
- if(((MenuOptionsDefinition)element).getOptions().equals(options))
+ Object element = elements.get(index);
+ if (element instanceof MenuOptionsDefinition)
{
- return (MenuOptionsDefinition)element;
+ if (((MenuOptionsDefinition) element).getOptions().equals(options))
+ {
+ return (MenuOptionsDefinition) element;
+ }
}
}
}
return null;
}
-
+
private MenuSeparatorDefinition getSeparatorDefinition(String options)
{
List elements = getMenuDefinition().getMenuElements();
- for(int index=0;index<elements.size();index++)
+ if (elements != null)
{
- Object element = elements.get(index);
- if(element instanceof MenuSeparatorDefinition)
+ for (int index = 0; index < elements.size(); index++)
{
- if(((MenuSeparatorDefinition)element).getText().equals(options))
+ Object element = elements.get(index);
+ if (element instanceof MenuSeparatorDefinition)
{
- return (MenuSeparatorDefinition)element;
+ if (((MenuSeparatorDefinition) element).getText().equals(options))
+ {
+ return (MenuSeparatorDefinition) element;
+ }
}
}
}
return null;
}
-
+
private MenuExcludeDefinition getExcludeDefinition(String options)
{
List elements = getMenuDefinition().getMenuElements();
- for(int index=0;index<elements.size();index++)
+ if (elements != null)
{
- Object element = elements.get(index);
- if(element instanceof MenuExcludeDefinition)
+ for (int index = 0; index < elements.size(); index++)
{
- if(((MenuExcludeDefinition)element).getName().equals(options))
+ Object element = elements.get(index);
+ if (element instanceof MenuExcludeDefinition)
{
- return (MenuExcludeDefinition)element;
+ if (((MenuExcludeDefinition) element).getName().equals(options))
+ {
+ return (MenuExcludeDefinition) element;
+ }
}
}
}
return null;
}
-
+
private MenuIncludeDefinition getIncludesDefinition(String options)
{
List elements = getMenuDefinition().getMenuElements();
- for(int index=0;index<elements.size();index++)
+ if (elements != null)
{
- Object element = elements.get(index);
- if(element instanceof MenuIncludeDefinition)
+ for (int index = 0; index < elements.size(); index++)
{
- if(((MenuIncludeDefinition)element).getName().equals(options))
+ Object element = elements.get(index);
+ if (element instanceof MenuIncludeDefinition)
{
- return (MenuIncludeDefinition)element;
+ if (((MenuIncludeDefinition) element).getName().equals(options))
+ {
+ return (MenuIncludeDefinition) element;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org