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 pn...@apache.org on 2004/01/09 19:42:03 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/common Uri.java
pnever 2004/01/09 10:42:03
Modified: src/share/org/apache/slide/common Uri.java
Log:
Made fields protected
Revision Changes Path
1.17 +31 -31 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Uri.java 27 Dec 2003 14:52:32 -0000 1.16
+++ Uri.java 9 Jan 2004 18:42:03 -0000 1.17
@@ -104,27 +104,27 @@
this.namespace = namespace;
parseUri(uri);
}
-
-
+
+
// ----------------------------------------------------- Instance Variables
/**
* Uri's namespace.
*/
- private transient Namespace namespace;
+ protected transient Namespace namespace;
/**
* uri MUST be unique.
*/
- private transient String uri;
+ protected transient String uri;
/**
* Scopes to which this Uri belongs.
*/
- private transient ScopeTokenizer scopes;
+ protected transient ScopeTokenizer scopes;
/**
@@ -136,19 +136,19 @@
/**
* FIXME : Probably useless.
*/
- private transient int pk;
+ protected transient int pk;
/**
* Associated Store instance.
*/
- private transient Store store;
+ protected transient Store store;
/**
* Associated SlideToken.
*/
- private transient SlideToken token;
+ protected transient SlideToken token;
// ------------------------------------------------------------- Properties
@@ -175,7 +175,7 @@
public static Uri getRoot(Uri uri) {
return new Uri(uri.getToken(), uri.getNamespace(), uri.getScope().toString());
}
-
+
/**
* Scope accessor.
@@ -320,7 +320,7 @@
* @return int hash code
*/
public int hashCode() {
- return pk;
+ return pk;
}
@@ -373,19 +373,19 @@
* @param uri Uri to parse
*/
private void parseUri(String uri) {
- // We first try to tokenize the uri string.
-
- scopes = new ScopeTokenizer(namespace, uri);
-
+ // We first try to tokenize the uri string.
+
+ scopes = new ScopeTokenizer(token, namespace, uri);
+
this.uri = scopes.getUri();
- // Find the qualifiying stuff from the registry.
- // Then we contentStore the scope of the found Data Source
+ // Find the qualifiying stuff from the registry.
+ // Then we contentStore the scope of the found Data Source
// within scope.
- store = null;
- while ((store == null) && (scopes.hasMoreElements())) {
- Scope courScope = scopes.nextScope();
- try {
+ store = null;
+ while ((store == null) && (scopes.hasMoreElements())) {
+ Scope courScope = scopes.nextScope();
+ try {
if (store == null) {
if (token == null) {
store = namespace.retrieveStore(courScope, null);
@@ -401,14 +401,14 @@
this.pk = this.uri.substring(scope.toString().length())
.hashCode();
}
- }
- } catch (ServiceConnectionFailedException e) {
- // Problem ...
+ }
+ } catch (ServiceConnectionFailedException e) {
+ // Problem ...
// FIXME : Throw a RuntimeException ??
- } catch (ServiceAccessException e) {
- // Problem ...
+ } catch (ServiceAccessException e) {
+ // Problem ...
// FIXME : Throw a RuntimeException ??
- }
+ }
}
// If descriptorsStore or contentStore is still null, then no valid
@@ -427,7 +427,7 @@
* Read serialized object.
*/
private void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException {
+ throws IOException, ClassNotFoundException {
String namespaceName = (String) in.readObject();
namespace = Domain.getNamespace(namespaceName);
parseUri((String) in.readObject());
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org