[freenet-CVS] freenet/src/freenet/client/cli Main.java, 1.3, 1.4 CLI.java, 1.24, 1.25

[Mika Hirvonen]

Update of /cvsroot/freenet/freenet/src/freenet/client/cli
In directory sc8-pr-cvs1:/tmp/cvs-serv380/src/freenet/client/cli

Modified Files:
        Main.java CLI.java 
Log Message:
clean up non-static access to static variables

Index: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Main.java   5 Jul 2003 18:50:46 -0000       1.3
+++ Main.java   31 Oct 2003 20:58:07 -0000      1.4
@@ -10,7 +10,7 @@
             CLI client = new CLI(p);
             boolean r = client.execute();
             client.stop();
-           client.fh.close();
+           CLI.fh.close();
             waitForThreadsAndExit(r ? 0 : 1); 
         } catch (CLIException e) {
             System.err.println(e.getMessage());

Index: CLI.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/cli/CLI.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- CLI.java    31 Oct 2003 19:21:18 -0000      1.24
+++ CLI.java    31 Oct 2003 20:58:07 -0000      1.25
@@ -447,7 +447,7 @@
         } else {
             ClientCommand cc = getCommand(params.getArg(0));
             if (cc == null) {
-                logger.log(this, "Command time: " + cc + " not supported.", 
logger.ERROR);
+                logger.log(this, "Command time: " + cc + " not supported.", 
Logger.ERROR);
                 usage();
                 return true;
             }
@@ -479,7 +479,7 @@
                     }
                 }
             } catch (IOException e) {
-                logger.log(this, "Error with data: " + e, e, logger.ERROR);
+                logger.log(this, "Error with data: " + e, e, Logger.ERROR);
                 return false;
             }
 
@@ -487,7 +487,7 @@
             try {
                 rp = cc.getProcess(params, metadata, data);
             } catch (CLIException e) {
-                logger.log(this, e.getMessage(), e, logger.ERROR);
+                logger.log(this, e.getMessage(), e, Logger.ERROR);
                 return false;
             }
            
@@ -499,7 +499,7 @@
             while ((r = rp.getNextRequest()) != null) {
                 if (!clientFactory.supportsRequest(r.getClass())) {
                     logger.log(this, "Current client cannot make request of type " 
-                                + r, logger.ERROR);
+                                + r, Logger.ERROR);
                     rp.abort();
                     return false;
                 }
@@ -512,7 +512,7 @@
                     Client c = clientFactory.getClient(r);
                     c.start();
                 } catch (IOException e) {
-                    logger.log(this, "IO error: " + e, e, logger.ERROR);
+                    logger.log(this, "IO error: " + e, e, Logger.ERROR);
                     return false;
                 } catch (freenet.KeyException e) {
                    logger.log(this, "Key error: " + e, e, Logger.ERROR);
@@ -537,7 +537,7 @@
                     }                    
                 }
             } else if (rp.failed())
-                logger.log(this, "Request failed.", logger.ERROR);
+                logger.log(this, "Request failed.", Logger.ERROR);
 
             if (!rp.failed() && cc.givesData() && stream) {
                 try {
@@ -548,7 +548,7 @@
                         out.write(b, 0, i);
                     }
                 } catch (IOException e) {
-                    logger.log(this, "IO error writing data: " + e.getMessage(), e, 
logger.ERROR);
+                    logger.log(this, "IO error writing data: " + e.getMessage(), e, 
Logger.ERROR);
                     return false;
                 }
             }

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs