Author: julien(a)jboss.com Date: 2008-07-01 17:53:05 -0400 (Tue, 01 Jul 2008) New Revision: 11243 Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStore.java Log: rename methods Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-07-01 21:51:03 UTC (rev 11242) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-07-01 21:53:05 UTC (rev 11243) @@ -92,7 +92,7 @@ } else if (id.startsWith("structure.")) { - return layoutStore.getItem(id.substring(10)); + return layoutStore.getElement(id.substring(10)); } else { @@ -153,7 +153,7 @@ { if (o instanceof PageNode) { - LayoutStructure layoutStructure = (LayoutStructure)layoutStore.findItemByRef(((PageNode)o).getId()); + LayoutStructure layoutStructure = (LayoutStructure)layoutStore.findElementByRef(((PageNode)o).getId()); // children = layoutStructure.getElements(); @@ -244,7 +244,7 @@ PageNode page = (PageNode)o; // - LayoutStructure layoutStructure = (LayoutStructure)layoutStore.findItemByRef(((PageNode)o).getId()); + LayoutStructure layoutStructure = (LayoutStructure)layoutStore.findElementByRef(((PageNode)o).getId()); // Map<String, Serializable> properties = new HashMap<String, Serializable>(page.getProperties()); Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStore.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStore.java 2008-07-01 21:51:03 UTC (rev 11242) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/layout/LayoutStore.java 2008-07-01 21:53:05 UTC (rev 11243) @@ -59,7 +59,7 @@ * @param id the layout object id * @return a layout object */ - public LayoutElement getItem(String id) + public LayoutElement getElement(String id) { LayoutElementContext context = contextsById.get(id); @@ -73,7 +73,7 @@ * @param ref the reference * @return a layout object */ - public LayoutElement findItemByRef(String ref) + public LayoutElement findElementByRef(String ref) { LayoutElementContext context = contextsByObjectRef.get(ref);