From 7f23c286da0c255ebe9983595f55368f73c799b2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 13 May 2010 13:50:04 -0700
Subject: [PATCH] Change newByDynamicClass to newById.

---
 lib/WebGUI/Asset/EMSSubmission.pm        |  4 ++--
 lib/WebGUI/Asset/File/GalleryFile.pm     |  8 ++++----
 lib/WebGUI/Asset/WikiPage.pm             |  4 ++--
 lib/WebGUI/Asset/Wobject/GalleryAlbum.pm | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/WebGUI/Asset/EMSSubmission.pm b/lib/WebGUI/Asset/EMSSubmission.pm
index 48e265839..f7e819a5f 100644
--- a/lib/WebGUI/Asset/EMSSubmission.pm
+++ b/lib/WebGUI/Asset/EMSSubmission.pm
@@ -346,8 +346,8 @@ sub www_editSubmission {
         my $assetId = $self ? $self->getId : $params->{assetId} || $session->form->get('assetId') || 'new';
 
         if( $assetId ne 'new' ) {
-            $self ||= WebGUI::Asset->newByDynamicClass($session,$assetId);
-            if (!defined $self) {
+            $self ||= eval { WebGUI::Asset->newById($session,$assetId); };
+            if (Exception::Class->caught()) {
                 $session->errorHandler->error(__PACKAGE__ . " - failed to instanciate asset with assetId $assetId");
             }
         }
diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm
index a22eb2292..78c59c720 100644
--- a/lib/WebGUI/Asset/File/GalleryFile.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile.pm
@@ -435,7 +435,7 @@ sub getFirstFile {
     my $allFileIds = $self->getParent->getFileIds;
 
     return undef unless @{ $allFileIds };
-    return WebGUI::Asset->newByDynamicClass( $self->session, shift @{ $allFileIds });
+    return WebGUI::Asset->newById( $self->session, shift @{ $allFileIds });
 }
 
 #----------------------------------------------------------------------------
@@ -452,7 +452,7 @@ sub getLastFile {
     my $allFileIds = $self->getParent->getFileIds;
 
     return undef unless @{ $allFileIds };
-    return WebGUI::Asset->newByDynamicClass( $self->session, pop @{ $allFileIds });
+    return WebGUI::Asset->newById( $self->session, pop @{ $allFileIds });
 }
 
 #----------------------------------------------------------------------------
@@ -469,7 +469,7 @@ sub getNextFile {
     return $self->{_nextFile} if $self->{_nextFile};
     my $nextId = $self->getParent->getNextFileId( $self->getId );
     return undef unless $nextId;
-    $self->{_nextFile} = WebGUI::Asset->newByDynamicClass( $self->session, $nextId );
+    $self->{_nextFile} = WebGUI::Asset->newById( $self->session, $nextId );
     return $self->{_nextFile};
 }
 
@@ -487,7 +487,7 @@ sub getPreviousFile {
     return $self->{_previousFile} if $self->{_previousFile};
     my $previousId  = $self->getParent->getPreviousFileId( $self->getId );
     return undef unless $previousId;
-    $self->{_previousFile} = WebGUI::Asset->newByDynamicClass( $self->session, $previousId );
+    $self->{_previousFile} = WebGUI::Asset->newById( $self->session, $previousId );
     return $self->{_previousFile};
 }
 
diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm
index caa5ac6a7..a84f71628 100644
--- a/lib/WebGUI/Asset/WikiPage.pm
+++ b/lib/WebGUI/Asset/WikiPage.pm
@@ -289,8 +289,8 @@ sub getTemplateVars {
         });
         PAGE: foreach my $assetId (@{ $paginator->getPageData }) {
             next PAGE if $assetId->{assetId} eq $self->getId;
-            my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId->{assetId});
-            next PAGE unless $asset;
+            my $asset = eval { WebGUI::Asset->newById($session, $assetId->{assetId}); };
+            next PAGE if Exception::Class->caught();
             push @keyword_pages, {
                 title => $asset->getTitle,
                 url   => $asset->getUrl,
diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
index 9251d2efe..b2fc69c27 100644
--- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
+++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -1247,10 +1247,10 @@ sub _moveFileAjaxRequest {
 
     # Get Id of target photo and instantiate asset
     my $targetId = $args->{target};
-    my $target = WebGUI::Asset->newByDynamicClass( $session, $targetId );
+    my $target = eval { WebGUI::Asset->newById( $session, $targetId ); };
 
     # Return if target photo could not be instantiated
-    unless ( $target ) {
+    if ( Exception::Class->caught() ) {
         $session->log->error("Couldn't move file '$targetId' because we couldn't instantiate it.");
         $result{ errMessage } = "ID of target file seems to be invalid.";
         return \%result;
@@ -1266,10 +1266,10 @@ sub _moveFileAjaxRequest {
 
     # Instantiate file with ID in before/after argument
     $destId = $args->{before} ? $args->{before} : $args->{after};            
-    $dest = WebGUI::Asset->newByDynamicClass( $session, $destId );
+    $dest = WebGUI::Asset->newById( $session, $destId );
 
     # Return if destination file could not be instantiated
-    unless ( $dest ) {
+    if ( Expeption::Class->caught() ) {
         $session->log->error("Couldn't move file '$targetId' before/after file '$destId' because we couldn't instantiate the latter.");
         $result{ errMessage } = "ID in before/after argument seems to be invalid.";
         return \%result;
@@ -1286,14 +1286,14 @@ sub _moveFileAjaxRequest {
         # Get ID of next sibling
         $destId = $self->getNextFileId( $destId );
         # Instantiate next sibling
-        $dest = WebGUI::Asset->newByDynamicClass( $session, $destId );
+        $dest = WebGUI::Asset->newById( $session, $destId );
     }
     # Check for use of before argument when increasing the rank
     if ( $args->{before} && $target->getRank() < $dest->getRank() ) {
         # Get ID of previous sibling
         $destId = $self->getPreviousFileId( $destId );
         # Instantiate previous sibling
-        $dest = WebGUI::Asset->newByDynamicClass( $session, $destId );
+        $dest = WebGUI::Asset->newById( $session, $destId );
     }
     
     # Update rank of target photo