Author: julien(a)jboss.com Date: 2007-01-10 19:44:24 -0500 (Wed, 10 Jan 2007) New Revision: 5988 Modified: trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java Log: make NoSuchPortletException extend InvalidPortletIdException because it makes more sense like that Modified: trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java 2007-01-10 23:27:44 UTC (rev 5987) +++ trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java 2007-01-11 00:44:24 UTC (rev 5988) @@ -26,37 +26,26 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class NoSuchPortletException extends PortletInvokerException +public class NoSuchPortletException extends InvalidPortletIdException { - private String portletId; - public NoSuchPortletException(String portletId) { - super("No such portlet " + portletId); - this.portletId = portletId; + super("No such portlet " + portletId, portletId); } public NoSuchPortletException(String message, String portletId) { - super(message); - this.portletId = portletId; + super(message, portletId); } public NoSuchPortletException(Throwable cause, String portletId) { - super(cause); - this.portletId = portletId; + super(cause, portletId); } public NoSuchPortletException(String message, Throwable cause, String portletId) { - super(message, cause); - this.portletId = portletId; + super(message, cause, portletId); } - - public String getPortletId() - { - return portletId; - } } Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java 2007-01-10 23:27:44 UTC (rev 5987) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/PortletManagementHandler.java 2007-01-11 00:44:24 UTC (rev 5988) @@ -175,11 +175,11 @@ org.jboss.portal.portlet.PortletContext response = producer.getInvoker().createClone(portalPC); return WSRPUtils.convertToWSRPPortletContext(response); } - catch (InvalidPortletIdException e) + catch (NoSuchPortletException e) { throw (InvalidHandleFault)WSRPUtils.createFaultFrom(InvalidHandleFault.class, e); } - catch (NoSuchPortletException e) + catch (InvalidPortletIdException e) { throw (InvalidHandleFault)WSRPUtils.createFaultFrom(InvalidHandleFault.class, e); } @@ -296,14 +296,14 @@ (PropertyChange[])changes.toArray(new PropertyChange[0])); return WSRPUtils.convertToWSRPPortletContext(resultContext); } + catch (NoSuchPortletException e) + { + throw (InvalidHandleFault)WSRPUtils.createFaultFrom(InvalidHandleFault.class, e); + } catch (InvalidPortletIdException e) { throw (InconsistentParametersFault)WSRPUtils.createFaultFrom(InconsistentParametersFault.class, e); } - catch (NoSuchPortletException e) - { - throw (InvalidHandleFault)WSRPUtils.createFaultFrom(InvalidHandleFault.class, e); - } catch (PortletInvokerException e) { throw WSRPUtils.createOperationFailedFault(e);