[gatein-commits] gatein SVN: r2603 - in components/mop/trunk: api/src/main/java/org/gatein/mop/api/workspace and 2 other directories.

Author: julien_viet Date: 2010-04-13 09:08:58 -0400 (Tue, 13 Apr 2010) New Revision: 2603 Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java components/mop/trunk/pom.xml Log: GTNMOP-21: Navigation node renaming Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -42,6 +42,13 @@ String getName(); /** + * Update the navigation name. + * + * @param name the new navigation name + */ + void setName(String name); + + /** * Extends the object type to navigation. * * @return the object type Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -54,7 +54,7 @@ public NavigationImpl addNavigation(String name) { NavigationImpl page = createNavigation(); - page.setName(name); + page.setNodeName(name); getNavigationList().add(page); return page; } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -34,6 +34,7 @@ import org.gatein.mop.api.workspace.link.PageLink; import java.util.List; +import java.util.Map; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> @@ -80,12 +81,25 @@ public abstract void setTemplatized(TemplatizedImpl templatized); + public String getName() + { + return getNodeName(); + } + + public void setName(String name) + { + // todo: change to setNodeName when it is fixed + NavigationContainer parent = getParentContainer(); + Map<String, NavigationImpl> map = parent.getNavigationMap(); + map.put(name, this); + } + public ObjectType<? extends Navigation> getObjectType() { return ObjectType.NAVIGATION; } - public Navigation getParent() + public NavigationImpl getParent() { NavigationContainer parent = getParentContainer(); if (parent != null) Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -40,6 +40,11 @@ public abstract ObjectType<? extends UIComponent> getObjectType(); + public String getName() + { + return getNodeName(); + } + public final UIContainerImpl getParent() { return getParentContainer(); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -108,7 +108,7 @@ { throw new UnsupportedOperationException(); } - child.setName(name); + child.setNodeName(name); List<UIComponentImpl> children = getComponentList(); children.add(index, child); return componentType.cast(child); Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -39,9 +39,9 @@ public ModelImpl model; @Name - public abstract String getName(); + public abstract String getNodeName(); - public abstract void setName(String name); + public abstract void setNodeName(String name); @Id public abstract String getObjectId(); @@ -67,7 +67,7 @@ ObjectType<?> objectType = getObjectType(); Class<? extends WorkspaceObject> javaType = objectType.getJavaType(); String typeName = javaType.getSimpleName(); - String name = getName(); + String name = getNodeName(); String id = getObjectId(); return typeName + "[name=" + name + ",id=" + id + "]"; } Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java =================================================================== --- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NavigationTestCase.java 2010-04-13 13:08:58 UTC (rev 2603) @@ -46,4 +46,15 @@ assertSame(n2, ns.get(1)); assertSame(n3, ns.get(2)); } + + public void testSetName() + { + ModelImpl model = pomService.getModel(); + Site portal = model.getWorkspace().addSite(ObjectType.PORTAL_SITE, "portal_for_navigation"); + Navigation root = portal.getRootNavigation(); + Navigation n1 = root.addChild("1"); + assertEquals("1", n1.getName()); + n1.setName("2"); + assertEquals("2", n1.getName()); + } } Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2010-04-13 11:44:36 UTC (rev 2602) +++ components/mop/trunk/pom.xml 2010-04-13 13:08:58 UTC (rev 2603) @@ -140,7 +140,7 @@ <!-- maven-enforcer-plugin --> <jdk.min.version>1.6</jdk.min.version> - <org.chromattic.version>1.0.1-cr1</org.chromattic.version> + <org.chromattic.version>1.0.1-cr2</org.chromattic.version> </properties>