From d27c7b5ccb4127615e700b10e1c7fba755665b2b Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 6 Jul 2011 20:37:17 +0000
Subject: [PATCH] NIHVIVO-2430 fixed discrepancy in namespace/localname
 generation when there is no local name part

---
 .../vitro/webapp/beans/BaseResourceBean.java    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
index a82e680ca..be5c21dfb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
@@ -10,6 +10,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openrdf.model.impl.URIImpl;
 
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+
 import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
@@ -113,20 +116,15 @@ public class BaseResourceBean implements ResourceBean {
             this.localName = null;
         } else {
             this.URI = URI;
-            try {
-                URIImpl uri = new URIImpl(URI);
-                this.namespace = uri.getNamespace();
-                this.localName = uri.getLocalName();
-            } catch (Exception e) {
-                log.error("Exception processing URI "+URI);
-                e.printStackTrace();
-            }
+            Resource uri = ResourceFactory.createResource(URI);
+            this.namespace = uri.getNameSpace();
+            this.localName = uri.getLocalName();
         }
     }
     
     public String getNamespace() {
         if( namespace == null && this.URI != null)
-            buildLocalAndNS( this.URI);        
+            buildLocalAndNS(this.URI);        
         return namespace;
     }
     public void setNamespace(String namespace) {
@@ -141,6 +139,7 @@ public class BaseResourceBean implements ResourceBean {
             buildLocalAndNS(this.URI);        
         return localName;
     }
+    
     public void setLocalName(String localName) {
         this.localName = localName;
         if (namespace != null && localName != null) {