[portal-commits] JBoss Portal SVN: r11212 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic/model and 10 other directories.

Author: julien(a)jboss.com Date: 2008-06-30 12:00:29 -0400 (Mon, 30 Jun 2008) New Revision: 11212 Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 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/ModelStructuralState.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java Log: remove name property on portal object, it can be used but should not be mandatory as some ui object won't have natural names Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -288,7 +288,7 @@ String url = encoder.encode(viewPage, encoderContext); - writer.print("<div>Link to page <a href=\"" + url + "\">" + object.getName() + "</a></div>"); + writer.print("<div>Link to page <a href=\"" + url + "\">" + object.getId() + "</a></div>"); } } } @@ -301,7 +301,7 @@ // writer.print("<li class=\"element\">"); writer.print("<div>"); - writer.print("Window " + object.getName()); + writer.print("Window " + object.getId()); writer.print("</div>"); writer.print("<div>"); writer.print(content.getMarkup()); Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -59,11 +59,6 @@ return object.getId(); } - public String getName() - { - return object.getName(); - } - public UIObject getObject() { return object; Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicViewPortContext.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -92,7 +92,7 @@ ClassicUINode child = nodes.get(childId); // - parent.children.put(child.getName(), child); + parent.children.put(child.getId(), child); child.parent = parent; } Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml =================================================================== --- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/page-structure.xml 2008-06-30 16:00:29 UTC (rev 11212) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <context-def xmlns="urn:jboss:portal:presentation:page:1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - name=""> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <simple-layout> <window-def name="windowA"> <portlet ref="/portal-server.Catalog"/> 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-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelAdapter.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -237,23 +237,6 @@ } } - public String getName(Object o) - { - if (o instanceof PortalNode) - { - return ((PortalNode)o).getName(); - } - else if (o instanceof LayoutElement) - { - // no natural name, for now use id - return ((LayoutElement)o).getId(); - } - else - { - throw new NotYetImplemented(); - } - } - public Map<String, Serializable> getProperties(Object o) { if (o instanceof PageNode) @@ -311,11 +294,10 @@ public StructuralState getState(Object o) { Class<? extends UIObject> type = getType(o); - String name = getName(o); Map<String, Serializable> properties = getProperties(o); // - return new ModelStructuralState(type, name, properties); + return new ModelStructuralState(type, properties); } public void lock(Object o) Modified: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java =================================================================== --- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/model/ModelStructuralState.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -39,18 +39,13 @@ private final Class<? extends UIObject> type; /** . */ - private final String name; - - /** . */ private final Map<String, Serializable> properties; public ModelStructuralState( Class<? extends UIObject> type, - String name, Map<String, Serializable> properties) { this.type = type; - this.name = name; this.properties = properties; } @@ -59,11 +54,6 @@ return type; } - public String getName() - { - return name; - } - public Map<String, Serializable> getProperties() { return properties; @@ -86,12 +76,6 @@ } // - if (!that.name.equals(this.name)) - { - return false; - } - - // return that.properties.equals(this.properties); } return false; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedUINode.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -59,11 +59,6 @@ return object.getId(); } - public String getName() - { - return object.getName(); - } - public UIObject getObject() { return object; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/pull/DetachedViewPortContext.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -92,7 +92,7 @@ DetachedUINode child = nodes.get(childId); // - parent.children.put(child.getName(), child); + parent.children.put(child.getId(), child); child.parent = parent; } Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -96,11 +96,6 @@ return structuralObject.getId(); } - public String getName() - { - return structuralObject.getState().getName(); - } - public <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException { if (stateType == null) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralAdapter.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -48,8 +48,6 @@ Class<? extends UIObject> getType(N n); - String getName(N n); - Map<String, Serializable> getProperties(N n); StructuralState getState(N n); Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -45,13 +45,6 @@ String getId(); /** - * Returns the name. - * - * @return the name - */ - String getName(); - - /** * Returns a property value or null if it does not exist. * * @param stateType the state type Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -38,7 +38,5 @@ Class<? extends UIObject> getType(); - String getName(); - Map<String, Serializable> getProperties(); } \ No newline at end of file Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -107,7 +107,6 @@ assertEquals(rootId, root.getId()); StructuralState state = root.getState(); assertEquals(UIContext.class, state.getType()); - assertEquals("", state.getName()); assertEquals(Collections.EMPTY_MAP, state.getProperties()); } @@ -166,7 +165,6 @@ assertEquals(fooId, foo.getId()); StructuralState fooState = foo.getState(); assertNotNull(fooState); - assertEquals("foo", fooState.getName()); assertEquals(Collections.EMPTY_MAP, fooState.getProperties()); assertEquals(UIPage.class, fooState.getType()); root = getStructuralStateContext().loadParent(foo); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -200,11 +200,11 @@ } if (propertyBehavior != null) { - propertyBehaviors.put(name, propertyBehavior); + propertyBehaviors.put(propertyName, propertyBehavior); } else { - propertyBehaviors.remove(name); + propertyBehaviors.remove(propertyName); } } @@ -257,7 +257,7 @@ } // - StructuralStateImpl state = new StructuralStateImpl(type, name, new HashMap<String, Serializable>(propertyValues)); + StructuralStateImpl state = new StructuralStateImpl(type, new HashMap<String, Serializable>(propertyValues)); // return new StructuralObjectImpl(handle, parentHandle, childrenHandles, state); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -39,15 +39,11 @@ private final Class<? extends UIObject> type; /** . */ - private final String name; - - /** . */ private final Map<String, Serializable> properties; - public StructuralStateImpl(Class<? extends UIObject> type, String name, Map<String, Serializable> properties) + public StructuralStateImpl(Class<? extends UIObject> type, Map<String, Serializable> properties) { this.type = type; - this.name = name; this.properties = properties; } @@ -56,11 +52,6 @@ return type; } - public String getName() - { - return name; - } - public Map<String, Serializable> getProperties() { return properties; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -76,12 +76,12 @@ } else { - NodeDef child = current.getChild(object.getName()); + NodeDef child = current.getChild(object.getId()); // if (child == null) { - throw new IllegalStateException("No such child " + object.getName()); + throw new IllegalStateException("No such child " + object.getId()); } // Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -182,7 +182,6 @@ public void assertEquals(UIObjectNode objectNode) { - Assert.assertEquals(name, objectNode.getObject().getName()); Assert.assertEquals(properties.keySet(), objectNode.getProperties().keySet()); for (String propertyName : properties.keySet()) { @@ -216,7 +215,6 @@ // for (UIObjectNode childObjectNode : objectNode.getChildren().values()) { - NodeDef child = children.get(childObjectNode.getObject().getName()); child.assertEquals(childObjectNode); } break; Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 15:29:22 UTC (rev 11211) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 16:00:29 UTC (rev 11212) @@ -98,7 +98,7 @@ } // - String key = child.getObject().getName(); + String key = child.getObject().getId(); // if (children.containsKey(key)) @@ -118,7 +118,7 @@ } // - String key = child.getObject().getName(); + String key = child.getObject().getId(); // if (!children.containsKey(key))