Author: ts
Date: Fri Sep 28 00:13:59 2007
New Revision: 6315
Log:
- Refactoring: Renamed ezcWebdavDisplay implementations according our naming
standards.
Modified:
trunk/Webdav/src/structs/display_information_empty.php
trunk/Webdav/src/structs/display_information_string.php
trunk/Webdav/src/structs/display_information_xml.php
trunk/Webdav/src/transport.php
trunk/Webdav/src/webdav_autoload.php
Modified: trunk/Webdav/src/structs/display_information_empty.php
==============================================================================
--- trunk/Webdav/src/structs/display_information_empty.php [iso-8859-1]
(original)
+++ trunk/Webdav/src/structs/display_information_empty.php [iso-8859-1] Fri Sep
28 00:13:59 2007
@@ -18,7 +18,7 @@
* @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-class ezcWebdavDisplayInformationEmpty extends ezcWebdavDisplayInformation
+class ezcWebdavEmptyDisplayInformation extends ezcWebdavDisplayInformation
{
/**
Modified: trunk/Webdav/src/structs/display_information_string.php
==============================================================================
--- trunk/Webdav/src/structs/display_information_string.php [iso-8859-1]
(original)
+++ trunk/Webdav/src/structs/display_information_string.php [iso-8859-1] Fri
Sep 28 00:13:59 2007
@@ -18,7 +18,7 @@
* @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-class ezcWebdavDisplayInformationString extends ezcWebdavDisplayInformation
+class ezcWebdavStringDisplayInformation extends ezcWebdavDisplayInformation
{
/**
Modified: trunk/Webdav/src/structs/display_information_xml.php
==============================================================================
--- trunk/Webdav/src/structs/display_information_xml.php [iso-8859-1] (original)
+++ trunk/Webdav/src/structs/display_information_xml.php [iso-8859-1] Fri Sep
28 00:13:59 2007
@@ -18,7 +18,7 @@
* @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-class ezcWebdavDisplayInformationXml extends ezcWebdavDisplayInformation
+class ezcWebdavXmlDisplayInformation extends ezcWebdavDisplayInformation
{
/**
Modified: trunk/Webdav/src/transport.php
==============================================================================
--- trunk/Webdav/src/transport.php [iso-8859-1] (original)
+++ trunk/Webdav/src/transport.php [iso-8859-1] Fri Sep 28 00:13:59 2007
@@ -251,7 +251,7 @@
{
switch ( true )
{
- case ( $info instanceof ezcWebdavDisplayInformationXml ):
+ case ( $info instanceof ezcWebdavXmlDisplayInformation ):
$info->body->formatOutput = true;
// Explicitly set txt/xml content type
if ( $info->response->getHeader( 'Content-Type' ) === null )
@@ -261,7 +261,7 @@
$result = $info->body->saveXML( $info->body );
break;
- case ( $info instanceof ezcWebdavDisplayInformationString ):
+ case ( $info instanceof ezcWebdavStringDisplayInformation ):
if ( $info->response->getHeader( 'Content-Type' ) === null )
{
throw new ezcWebdavMissingHeaderException( 'ContentType' );
@@ -269,7 +269,7 @@
$result = $info->body;
break;
- case ( $info instanceof ezcWebdavDisplayInformationEmpty ):
+ case ( $info instanceof ezcWebdavEmptyDisplayInformation ):
default:
if ( ( $contenTypeHeader = $info->response->getHeader(
'Content-Type' ) ) !== null )
{
@@ -1164,7 +1164,7 @@
* Returns an XML representation of the given response object.
*
* @param ezcWebdavMultiStatusResponse $response
- * @return ezcWebdavDisplayInformationXml
+ * @return ezcWebdavXmlDisplayInformation
*/
protected function processMultiStatusResponse(
ezcWebdavMultiStatusResponse $response )
{
@@ -1184,14 +1184,14 @@
);
}
- return new ezcWebdavDisplayInformationXml( $response, $dom );
+ return new ezcWebdavXmlDisplayInformation( $response, $dom );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavPropFindResponse $response
- * @return ezcWebdavDisplayInformationXml
+ * @return ezcWebdavXmlDisplayInformation
*/
protected function processPropFindResponse( ezcWebdavPropFindResponse
$response )
{
@@ -1211,51 +1211,51 @@
$dom->importNode( $this->processPropStatResponse( $propStat
)->body->documentElement, true )
);
}
- return new ezcWebdavDisplayInformationXml( $response, $dom );
+ return new ezcWebdavXmlDisplayInformation( $response, $dom );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavPropPatchResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processPropPatchResponse( ezcWebdavPropPatchResponse
$response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavCopyResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processCopyResponse( ezcWebdavCopyResponse $response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavMoveResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processMoveResponse( ezcWebdavMoveResponse $response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavDeleteResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processDeleteResponse( ezcWebdavDeleteResponse
$response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
@@ -1263,11 +1263,11 @@
*
* @param ezcWebdavErrorResponse $response
* @param bool $xml DOMDocument in result only generated of true.
- * @return ezcWebdavDisplayInformationXml|ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavXmlDisplayInformation|ezcWebdavEmptyDisplayInformation
*/
protected function processErrorResponse( ezcWebdavErrorResponse $response,
$xml = false )
{
- $res = new ezcWebdavDisplayInformationEmpty( $response );
+ $res = new ezcWebdavEmptyDisplayInformation( $response );
if ( $xml === true )
{
$dom = $this->xml->createDomDocument();
@@ -1282,7 +1282,7 @@
$responseElement->appendChild(
$this->xml->createDomElement( $dom, 'status' )
)->nodeValue = (string) $response;
- $res = new ezcWebdavDisplayInformationXml( $response, $dom );
+ $res = new ezcWebdavXmlDisplayInformation( $response, $dom );
}
return $res;
}
@@ -1291,18 +1291,18 @@
* Returns an XML representation of the given response object.
*
* @param ezcWebdavGetCollectionResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processGetCollectionResponse(
ezcWebdavGetCollectionResponse $response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavGetResourceResponse $response
- * @return ezcWebdavDisplayInformationString
+ * @return ezcWebdavStringDisplayInformation
* @todo Do we need to set more headers here?
*/
protected function processGetResourceResponse(
ezcWebdavGetResourceResponse $response )
@@ -1316,25 +1316,25 @@
$response->setHeader( 'Content-Type', $contentTypeHeader );
}
// Content-Length automatically send by web server
- return new ezcWebdavDisplayInformationString( $response,
$response->resource->content );
+ return new ezcWebdavStringDisplayInformation( $response,
$response->resource->content );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavPutResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processPutResponse( ezcWebdavPutResponse $response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavHeadResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
* @todo Do we need to set more headers here?
*/
protected function processHeadResponse( ezcWebdavHeadResponse $response )
@@ -1352,36 +1352,36 @@
{
$response->setHeader( 'Content-Length', ( strlen(
$response->resource->content ) + 1 ) );
}
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavMakeCollectionResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processMakeCollectionResponse(
ezcWebdavMakeCollectionResponse $response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavOptionsResponse $response
- * @return ezcWebdavDisplayInformationEmpty
+ * @return ezcWebdavEmptyDisplayInformation
*/
protected function processOptionsResponse( ezcWebdavOptionsResponse
$response )
{
- return new ezcWebdavDisplayInformationEmpty( $response );
+ return new ezcWebdavEmptyDisplayInformation( $response );
}
/**
* Returns an XML representation of the given response object.
*
* @param ezcWebdavPropStatResponse $response
- * @return ezcWebdavDisplayInformationXml
+ * @return ezcWebdavXmlDisplayInformation
*/
protected function processPropStatResponse( ezcWebdavPropStatResponse
$response )
{
@@ -1403,7 +1403,7 @@
)
)->nodeValue = (string) $response;
- return new ezcWebdavDisplayInformationXml( $response, $dom );
+ return new ezcWebdavXmlDisplayInformation( $response, $dom );
}
/**
Modified: trunk/Webdav/src/webdav_autoload.php
==============================================================================
--- trunk/Webdav/src/webdav_autoload.php [iso-8859-1] (original)
+++ trunk/Webdav/src/webdav_autoload.php [iso-8859-1] Fri Sep 28 00:13:59 2007
@@ -47,9 +47,9 @@
'ezcWebdavDeadProperty' => 'Webdav/properties/dead.php',
'ezcWebdavDeleteRequest' => 'Webdav/requests/delete.php',
'ezcWebdavDeleteResponse' =>
'Webdav/responses/delete.php',
- 'ezcWebdavDisplayInformationEmpty' =>
'Webdav/structs/display_information_empty.php',
- 'ezcWebdavDisplayInformationString' =>
'Webdav/structs/display_information_string.php',
- 'ezcWebdavDisplayInformationXml' =>
'Webdav/structs/display_information_xml.php',
+ 'ezcWebdavEmptyDisplayInformation' =>
'Webdav/structs/display_information_empty.php',
+ 'ezcWebdavStringDisplayInformation' =>
'Webdav/structs/display_information_string.php',
+ 'ezcWebdavXmlDisplayInformation' =>
'Webdav/structs/display_information_xml.php',
'ezcWebdavDisplayNameProperty' =>
'Webdav/properties/displayname.php',
'ezcWebdavErrorResponse' => 'Webdav/responses/error.php',
'ezcWebdavFileBackend' => 'Webdav/backends/file.php',
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
