You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2004/09/22 15:38:33 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/common Uri.java
luetzkendorf 2004/09/22 06:38:33
Modified: src/share/org/apache/slide/store Tag:
SLIDE_2_1_RELEASE_BRANCH ResourceId.java
src/share/org/apache/slide/common Tag:
SLIDE_2_1_RELEASE_BRANCH Uri.java
Log:
removed pk member at Uri and fixed hashCode functions
Revision Changes Path
No revision
No revision
1.4.2.1 +5 -5 jakarta-slide/src/share/org/apache/slide/store/ResourceId.java
Index: ResourceId.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/ResourceId.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ResourceId.java 28 Jul 2004 09:34:41 -0000 1.4
+++ ResourceId.java 22 Sep 2004 13:38:33 -0000 1.4.2.1
@@ -153,7 +153,7 @@
* @return int hash code
*/
public int hashCode() {
- return super.hashCode();
+ return this.uuri.hashCode();
}
public Scope getScope() {
No revision
No revision
1.19.2.1 +5 -17 jakarta-slide/src/share/org/apache/slide/common/Uri.java
Index: Uri.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- Uri.java 28 Jul 2004 09:38:08 -0000 1.19
+++ Uri.java 22 Sep 2004 13:38:33 -0000 1.19.2.1
@@ -93,12 +93,6 @@
/**
- * FIXME : Probably useless.
- */
- protected transient int pk;
-
-
- /**
* Associated Store instance.
*/
protected transient Store store;
@@ -220,7 +214,6 @@
*/
public void invalidateServices() {
store = null;
- pk = 0;
parseUri(this.uri);
}
@@ -279,7 +272,7 @@
* @return int hash code
*/
public int hashCode() {
- return pk;
+ return this.uri.hashCode();
}
@@ -354,11 +347,6 @@
if (store != null) {
scope = courScope;
- // The PK in the current descriptorsStore is the
- // portion of the URI relative
- // to the Data Source.
- this.pk = this.uri.substring(scope.toString().length())
- .hashCode();
}
}
} catch (ServiceConnectionFailedException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org