[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slide-dev
Subject:    cvs commit: jakarta-slide/src/stores/org/apache/slide/index/lucene Index.java
From:       unico () apache ! org
Date:       2004-10-30 12:52:11
Message-ID: 20041030125211.65839.qmail () minotaur ! apache ! org
[Download RAW message or body]

unico       2004/10/30 05:52:11

  Modified:    webdavclient/clientlib/src/java/org/apache/webdav/ui
                        WebdavSystemView.java
               src/stores/org/apache/slide/index/lucene/expressions
                        EqExpression.java GtExpression.java
                        BetweenExpression.java LtExpression.java
               src/stores/org/apache/slide/index/lucene Index.java
  Log:
  access static methods in static way
  
  Revision  Changes    Path
  1.3       +6 -6      \
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/ui/WebdavSystemView.java
  
  Index: WebdavSystemView.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/ui/WebdavSystemView.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WebdavSystemView.java	11 Oct 2004 08:20:02 -0000	1.2
  +++ WebdavSystemView.java	30 Oct 2004 12:52:11 -0000	1.3
  @@ -56,7 +56,7 @@
                               String password)
           throws IllegalAccessError, URIException, IOException {
           try {
  -            this.rootURL = this.uriToHttpURL(uri + rootPath);
  +            this.rootURL = uriToHttpURL(uri + rootPath);
               this.uri = uri;
               this.rootURL.setUserinfo(username, password);
               this.username = username;
  @@ -164,7 +164,7 @@
               WebdavFile newFolder = null;
               HttpURL url = null;
   
  -            url = this.uriToHttpURL(containingDir.getPath() +
  +            url = uriToHttpURL(containingDir.getPath() +
                                       WebdavFile.davSeparator + newFolderString);
               // Need to add user info so has access for queries
               url.setUserinfo(username, password);
  @@ -436,7 +436,7 @@
   
                   String filepath =  localDir + filenames[i];
                   //System.out.println("getFiles : file fullpath : " + filepath);
  -                url = this.uriToHttpURL(filepath);
  +                url = uriToHttpURL(filepath);
                   // Need to add user info so has access for queries
                   url.setUserinfo(username, password);
                   files[i] = new WebdavFile(url, this.rootURL);
  
  
  
  1.4       +5 -5      \
jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/EqExpression.java  \
  Index: EqExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/EqExpression.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EqExpression.java	25 Oct 2004 07:52:30 -0000	1.3
  +++ EqExpression.java	30 Oct 2004 12:52:11 -0000	1.4
  @@ -49,10 +49,10 @@
   
           String value;
           if (index.getConfiguration().isDateProperty(prop.getNamespaceURI(), \
                prop.getName())) {
  -            value = \
config.dateToIndexString(config.getDateValue(literal.getTextTrim()));  +            \
value = config.dateToIndexString(IndexConfiguration.getDateValue(literal.getTextTrim()));
  } 
           else if (index.getConfiguration().isIntProperty(prop.getNamespaceURI(), \
                prop.getName())) { 
  -            value = \
config.intToIndexString(Long.parseLong(literal.getTextTrim()));  +            value = \
IndexConfiguration.intToIndexString(Long.parseLong(literal.getTextTrim()));  } 
           else {
               value = literal.getTextTrim();
  
  
  
  1.4       +5 -5      \
jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/GtExpression.java  \
  Index: GtExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/GtExpression.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GtExpression.java	25 Oct 2004 07:52:30 -0000	1.3
  +++ GtExpression.java	30 Oct 2004 12:52:11 -0000	1.4
  @@ -50,12 +50,12 @@
           String value;
           String upperBound;
           if (index.getConfiguration().isDateProperty(prop.getNamespaceURI(), \
                prop.getName())) {
  -            Date date = config.getDateValue(literal.getTextTrim());
  +            Date date = IndexConfiguration.getDateValue(literal.getTextTrim());
               value = config.dateToIndexString(date);
               upperBound = Index.DATE_UPPER_BOUND;
           } 
           else if (index.getConfiguration().isIntProperty(prop.getNamespaceURI(), \
                prop.getName())) { 
  -            value = \
config.intToIndexString(Long.parseLong(literal.getTextTrim()));  +            value = \
IndexConfiguration.intToIndexString(Long.parseLong(literal.getTextTrim()));  \
upperBound = Index.INT_UPPER_BOUND;  } 
           else {
  
  
  
  1.4       +7 -7      \
jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/BetweenExpression.java
  
  Index: BetweenExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/BetweenExpression.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BetweenExpression.java	25 Oct 2004 07:52:30 -0000	1.3
  +++ BetweenExpression.java	30 Oct 2004 12:52:11 -0000	1.4
  @@ -70,13 +70,13 @@
           String value2;
           if (index.getConfiguration().isDateProperty(prop.getNamespaceURI(), \
prop.getName())) {  value1 = config.dateToIndexString(
  -                    config.getDateValue(literal1.getTextTrim()));
  +            		IndexConfiguration.getDateValue(literal1.getTextTrim()));
               value2 = config.dateToIndexString(
  -                    config.getDateValue(literal2.getTextTrim()));
  +            		IndexConfiguration.getDateValue(literal2.getTextTrim()));
           } 
           else if (index.getConfiguration().isIntProperty(prop.getNamespaceURI(), \
                prop.getName())) { 
  -            value1 = \
                config.intToIndexString(Long.parseLong(literal1.getTextTrim()));
  -            value2 = \
config.intToIndexString(Long.parseLong(literal2.getTextTrim()));  +            value1 \
= IndexConfiguration.intToIndexString(Long.parseLong(literal1.getTextTrim()));  +     \
value2 = IndexConfiguration.intToIndexString(Long.parseLong(literal2.getTextTrim())); \
}   else {
               value1 = literal1.getTextTrim();
  
  
  
  1.3       +5 -5      \
jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/LtExpression.java  \
  Index: LtExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/expressions/LtExpression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LtExpression.java	22 Oct 2004 15:14:46 -0000	1.2
  +++ LtExpression.java	30 Oct 2004 12:52:11 -0000	1.3
  @@ -52,7 +52,7 @@
           String value;
           String lowerBound;
           if (index.getConfiguration().isDateProperty(prop.getNamespaceURI(), \
                prop.getName())) {
  -            Date date = config.getDateValue(literal.getTextTrim());
  +            Date date = IndexConfiguration.getDateValue(literal.getTextTrim());
               Calendar c = Calendar.getInstance();
               c.setTime(date);
               inclusive =  c.get(Calendar.SECOND) > 0;
  @@ -60,7 +60,7 @@
               lowerBound = Index.DATE_LOWER_BOUND;
           } 
           else if (index.getConfiguration().isIntProperty(prop.getNamespaceURI(), \
                prop.getName())) { 
  -            value = \
config.intToIndexString(Long.parseLong(literal.getTextTrim()));  +            value = \
IndexConfiguration.intToIndexString(Long.parseLong(literal.getTextTrim()));  \
lowerBound = Index.INT_LOWER_BOUND;  } 
           else {
  
  
  
  1.4       +5 -5      \
jakarta-slide/src/stores/org/apache/slide/index/lucene/Index.java  
  Index: Index.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/Index.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Index.java	28 Oct 2004 16:00:14 -0000	1.3
  +++ Index.java	30 Oct 2004 12:52:11 -0000	1.4
  @@ -226,7 +226,7 @@
                           value.toString()));
               }
               if (configuration.isDateProperty(namespace, name)) {
  -                Date date = configuration.getDateValue(value);
  +                Date date = IndexConfiguration.getDateValue(value);
                   if (date != null) {
                       doc.add(unstoredString(configuration.generateFieldName(
                               property.getNamespace(), property.getName()), 
  @@ -237,7 +237,7 @@
                   try {
                       doc.add(unstoredString(configuration.generateFieldName(
                               property.getNamespace(), property.getName()),
  -                            configuration.intToIndexString(
  +                            IndexConfiguration.intToIndexString(
                                       Long.parseLong(value.toString()))));
                   } catch (NumberFormatException ex)  {
                       // TODO log warning
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic