luetzkendorf    2004/11/08 01:28:41

  Modified:    src/share/org/apache/slide/common Uri.java
  Log:
  made parseUri protected to enable overwrite in ResourceId
  
  Revision  Changes    Path
  1.21      +9 -10     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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Uri.java  22 Sep 2004 15:20:23 -0000      1.20
  +++ Uri.java  8 Nov 2004 09:28:41 -0000       1.21
  @@ -61,6 +61,7 @@
       public Uri(SlideToken token, Namespace namespace, String uri) {
           this.token = token;
           this.namespace = namespace;
  +        this.uri = uri;
           parseUri(uri);
       }
       
  @@ -324,12 +325,12 @@
        *
        * @param uri Uri to parse
        */
  -    private void parseUri(String uri) {
  +    protected void parseUri(String uri) {
           // We first try to tokenize the uri string.
           
           scopes = new ScopeTokenizer(token, namespace, uri);
           
  -        this.uri = scopes.getUri();
  +        this.uri = scopes.getUri(); // why that
           
           // Find the qualifiying stuff from the registry.
           // Then we contentStore the scope of the found Data Source
  @@ -350,11 +351,9 @@
                       }
                   }
               } catch (ServiceConnectionFailedException e) {
  -                // Problem ...
  -                // FIXME : Throw a RuntimeException ??
  +                throw new SlideRuntimeException(e.toString(), true);
               } catch (ServiceAccessException e) {
  -                // Problem ...
  -                // FIXME : Throw a RuntimeException ??
  +                throw new SlideRuntimeException(e.toString(), true);
               }
           }
           
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to