[portal-commits] JBoss Portal SVN: r11215 - in modules/presentation/trunk/presentation/src: main/java/org/jboss/portal/presentation/layout and 2 other directories.

Author: julien(a)jboss.com Date: 2008-06-30 12:16:11 -0400 (Mon, 30 Jun 2008) New Revision: 11215 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/UIWindowImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java Log: correct naming of method 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 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -96,7 +96,7 @@ return structuralObject.getId(); } - public <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException + public <T> T getPropertyValue(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/model/ui/UIWindowImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIWindowImpl.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -44,11 +44,11 @@ public WindowState getWindowState() { - return getProperty(StateType.NAVIGATIONAL, "windowstate", WindowState.class); + return getPropertyValue(StateType.NAVIGATIONAL, "windowstate", WindowState.class); } public Mode getMode() { - return getProperty(StateType.NAVIGATIONAL, "mode", Mode.class); + return getPropertyValue(StateType.NAVIGATIONAL, "mode", Mode.class); } } Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java 2008-06-30 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/layout/ModelLayoutAdapter.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -45,7 +45,7 @@ UIObject object = item.getObject(); // - return object.getProperty(StateType.STRUCTURAL, propertyName, propertyType); + return object.getPropertyValue(StateType.STRUCTURAL, propertyName, propertyType); } public Collection<? extends UINode> getChildren(UINode item) 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 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIObject.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -54,7 +54,10 @@ * @throws IllegalArgumentException if any argument is null or not valid * @throws StateException any state exception */ - <T> T getProperty(StateType stateType, String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException; + <T> T getPropertyValue( + StateType stateType, + String propertyName, + Class<T> propertyType) throws IllegalArgumentException, StateException; /** * Returns the set of property names of this object 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 16:11:18 UTC (rev 11214) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-06-30 16:16:11 UTC (rev 11215) @@ -70,7 +70,7 @@ for (String name : object.getPropertyNames(StateType.STRUCTURAL)) { - String value = object.getProperty(StateType.STRUCTURAL, name, String.class); + String value = object.getPropertyValue(StateType.STRUCTURAL, name, String.class); properties.put(name, value); } }