svn commit: r385341 - /jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java

[se...@apache.org]

Author: sebb
Date: Sun Mar 12 10:48:49 2006
New Revision: 385341

URL: http://svn.apache.org/viewcvs?rev=385341&view=rev
Log:
Make parser an instance variable

Modified:
    jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java

Modified: jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=385341&r1=385340&r2=385341&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java Sun Mar 12 10:48:49 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004,2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.apache.jmeter.monitor.model;
 
+// For unit tests, @see TestObjectFactory
+
 import org.apache.jmeter.monitor.parser.Parser;
 import org.apache.jmeter.monitor.parser.ParserImpl;
 import org.apache.jmeter.samplers.SampleResult;
@@ -27,7 +29,7 @@
 
 	private static ObjectFactory FACTORY = null;
 
-	private static Parser PARSER = null;
+	private Parser PARSER = null;
 
 	/**
 	 * 
@@ -91,56 +93,6 @@
 	protected static class MonitorParser extends ParserImpl {
 		public MonitorParser(ObjectFactory factory) {
 			super(factory);
-		}
-	}
-
-	/**
-	 * Basic method for testing the class
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		if (args != null && args.length == 2) {
-			String file = null;
-			// int count = 1;
-			if (args[0] != null) {
-				file = args[0];
-			}
-			if (args[1] != null) {
-				// count = Integer.parseInt(args[1]);
-			}
-			try {
-				ObjectFactory of = ObjectFactory.getInstance();
-				java.io.File infile = new java.io.File(file);
-				java.io.FileInputStream fis = new java.io.FileInputStream(infile);
-				java.io.InputStreamReader isr = new java.io.InputStreamReader(fis);
-				StringBuffer buf = new StringBuffer();
-				java.io.BufferedReader br = new java.io.BufferedReader(isr);
-				String line = null;
-				while ((line = br.readLine()) != null) {
-					buf.append(line);
-				}
-				System.out.println("contents: ");
-				System.out.println(buf.toString());
-				System.out.println("----------------------");
-				Status st = of.parseBytes(buf.toString().getBytes());
-				if (st == null) {
-					System.out.println("parse failed");
-				} else {
-					System.out.println("parse successful:");
-					System.out.println(st.getJvm().getMemory().getFree());
-					System.out.println(st.getJvm().getMemory().getTotal());
-					System.out.println(st.getJvm().getMemory().getMax());
-					System.out.println("connector size: " + st.getConnector().size());
-					Connector conn = (Connector) st.getConnector().get(0);
-					System.out.println("conn: " + conn.getThreadInfo().getMaxThreads());
-				}
-			} catch (java.io.FileNotFoundException e) {
-				e.printStackTrace();
-			} catch (java.io.IOException e) {
-				e.printStackTrace();
-			}
-		} else {
 		}
 	}
 }



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