[simal] r2236 committed - Removing dead code from JCR implementation.

0 views
Skip to first unread message

si...@googlecode.com

unread,
Apr 14, 2011, 7:36:12 AM4/14/11
to simal-...@googlegroups.com
Revision: 2236
Author: sander.v...@oucs.ox.ac.uk
Date: Thu Apr 14 04:35:17 2011
Log: Removing dead code from JCR implementation.
http://code.google.com/p/simal/source/detail?r=2236

Modified:

/trunk/uk.ac.osswatch.simal.core/src/main/java/uk/ac/osswatch/simal/model/AbstractResource.java

=======================================
---
/trunk/uk.ac.osswatch.simal.core/src/main/java/uk/ac/osswatch/simal/model/AbstractResource.java
Sun Mar 6 13:04:04 2011
+++
/trunk/uk.ac.osswatch.simal.core/src/main/java/uk/ac/osswatch/simal/model/AbstractResource.java
Thu Apr 14 04:35:17 2011
@@ -15,17 +15,17 @@
* limitations under the License.
*/
import java.net.MalformedURLException;
-import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;

import org.apache.commons.lang.StringEscapeUtils;

-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.xmloutput.impl.BaseXMLWriter;
-
import uk.ac.osswatch.simal.rdf.SimalRepositoryException;
import uk.ac.osswatch.simal.rdf.io.RDFUtils;

+import com.hp.hpl.jena.rdf.model.RDFWriter;
+import com.hp.hpl.jena.xmloutput.impl.BaseXMLWriter;
+
public abstract class AbstractResource implements IResource {
private static final long serialVersionUID = 1L;
protected String uri;
@@ -45,7 +45,6 @@
if (!simalID.startsWith("/")) {
simalID = "/" + simalID;
}
- setPath(simalID);
setSimalID(simalID);
}

@@ -96,22 +95,6 @@
return getUniqueSimalID();
}

-
- /** The JCR Path of this object **/
- String path;
- public String getPath() {
- return path;
- }
-
- protected void setPath(URI uri) {
- // path = "/" + uri.getHost() + uri.getPath();
- path = "/myFolder";
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
/**
* Set namespace prefixes for more readable XML output.
* @param writer
@@ -135,7 +118,6 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((path == null) ? 0 : path.hashCode());
result = prime * result + ((uri == null) ? 0 : uri.hashCode());
return result;
}
@@ -152,11 +134,6 @@
if (getClass() != obj.getClass())
return false;
AbstractResource other = (AbstractResource) obj;
- if (path == null) {
- if (other.path != null)
- return false;
- } else if (!path.equals(other.path))
- return false;
if (uri == null) {
if (other.uri != null)
return false;

Reply all
Reply to author
Forward
0 new messages