[Jrobin-commits] src/org/jrobin/mrtg/server Config.java,1.3,1.4 Poller.java,1.3,1.4 RawSample.java,1.2,1.3 RrdWriter.java,1.3,1.4

[Sasa M. <sa...@us...>]

Update of /cvsroot/jrobin/src/org/jrobin/mrtg/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13941/org/jrobin/mrtg/server

Modified Files:
	Config.java Poller.java RawSample.java RrdWriter.java 
Log Message:


Index: Config.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Config.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Config.java	8 Mar 2004 13:14:39 -0000	1.3
--- Config.java	19 Apr 2004 13:45:39 -0000	1.4
***************
*** 62,70 ****
  	}
  
! 	public static String getRrdTemplateFile() {
  		return RRD_DEF_TEMPLATE_FILE;
  	}
  
! 	public static String getGraphTemplateFile() {
  		return RRD_GRAPH_DEF_TEMPLATE_FILE;
  	}
--- 62,70 ----
  	}
  
! 	static String getRrdTemplateFile() {
  		return RRD_DEF_TEMPLATE_FILE;
  	}
  
! 	static String getGraphTemplateFile() {
  		return RRD_GRAPH_DEF_TEMPLATE_FILE;
  	}

Index: Poller.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/Poller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Poller.java	8 Apr 2004 12:00:01 -0000	1.3
--- Poller.java	19 Apr 2004 13:45:39 -0000	1.4
***************
*** 55,59 ****
  	private SNMPv1CommunicationInterface comm;
  
!     public Poller(String host, String community)
  		throws IOException {
  		// check for port information
--- 55,59 ----
  	private SNMPv1CommunicationInterface comm;
  
!     Poller(String host, String community)
  		throws IOException {
  		// check for port information
***************
*** 72,76 ****
      }
  
!     public String getNumericOid(String oid) {
      	int n = OIDS.length;
      	for(int i = 0; i < n; i++) {
--- 72,76 ----
      }
  
!     String getNumericOid(String oid) {
      	int n = OIDS.length;
      	for(int i = 0; i < n; i++) {
***************
*** 84,88 ****
      }
  
! 	public String get(String oid) throws IOException {
  		String numericOid = getNumericOid(oid);
  		try {
--- 84,88 ----
      }
  
! 	String get(String oid) throws IOException {
  		String numericOid = getNumericOid(oid);
  		try {
***************
*** 100,108 ****
  	}
  
! 	public String get(String oid, int index) throws IOException {
  		return get(oid + "." + index);
  	}
  
! 	public String[] get(String[] oids) throws IOException {
  		int count = oids.length;
  		String[] result = new String[count];
--- 100,108 ----
  	}
  
! 	String get(String oid, int index) throws IOException {
  		return get(oid + "." + index);
  	}
  
! 	String[] get(String[] oids) throws IOException {
  		int count = oids.length;
  		String[] result = new String[count];
***************
*** 113,117 ****
  	}
  
! 	public SortedMap walk(String base) throws IOException {
  		SortedMap map = new TreeMap();
  		String baseOid = getNumericOid(base);
--- 113,117 ----
  	}
  
! 	SortedMap walk(String base) throws IOException {
  		SortedMap map = new TreeMap();
  		String baseOid = getNumericOid(base);
***************
*** 141,145 ****
  	}
  
! 	public SortedMap walkIfDescr() throws IOException {
  		SortedMap rawInterfacesMap = walk("ifDescr");
  		SortedMap enumeratedInterfacesMap = new TreeMap();
--- 141,145 ----
  	}
  
! 	SortedMap walkIfDescr() throws IOException {
  		SortedMap rawInterfacesMap = walk("ifDescr");
  		SortedMap enumeratedInterfacesMap = new TreeMap();
***************
*** 163,167 ****
  	}
  
! 	public int getIfIndexByIfDescr(String ifDescr) throws IOException {
  		SortedMap map = walkIfDescr();
  		Iterator it = map.keySet().iterator();
--- 163,167 ----
  	}
  
! 	int getIfIndexByIfDescr(String ifDescr) throws IOException {
  		SortedMap map = walkIfDescr();
  		Iterator it = map.keySet().iterator();
***************
*** 176,180 ****
  	}
  
! 	public void close() {
  		if(comm != null) {
  			try {
--- 176,180 ----
  	}
  
! 	void close() {
  		if(comm != null) {
  			try {

Index: RawSample.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/RawSample.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RawSample.java	10 Nov 2003 08:52:29 -0000	1.2
--- RawSample.java	19 Apr 2004 13:45:39 -0000	1.3
***************
*** 37,101 ****
  	private int ifOperStatus;
  
! 	public String getHost() {
  		return host;
  	}
  
! 	public void setHost(String host) {
  		this.host = host;
  	}
  
! 	public String getIfDescr() {
  		return ifDescr;
  	}
  
! 	public void setIfDescr(String ifDescr) {
  		this.ifDescr = ifDescr;
  	}
  
! 	public boolean isValid() {
  		return valid;
  	}
  
! 	public void setValid(boolean valid) {
  		this.valid = valid;
  	}
  
! 	public long getTimestamp() {
  		return timestamp;
  	}
  
! 	public void setTimestamp(long timestamp) {
  		this.timestamp = timestamp;
  	}
  
! 	public long getIfInOctets() {
  		return ifInOctets;
  	}
  
! 	public void setIfInOctets(long ifInOctets) {
  		this.ifInOctets = ifInOctets;
  	}
  
! 	public long getIfOutOctets() {
  		return ifOutOctets;
  	}
  
! 	public void setIfOutOctets(long ifOutOctets) {
  		this.ifOutOctets = ifOutOctets;
  	}
  
! 	public long getSysUpTime() {
  		return sysUpTime;
  	}
  
! 	public void setSysUpTime(long sysUpTime) {
  		this.sysUpTime = sysUpTime;
  	}
  
! 	public int getIfOperStatus() {
  		return ifOperStatus;
  	}
  
! 	public void setIfOperStatus(int ifOperStatus) {
  		this.ifOperStatus = ifOperStatus;
  	}
--- 37,101 ----
  	private int ifOperStatus;
  
! 	String getHost() {
  		return host;
  	}
  
! 	void setHost(String host) {
  		this.host = host;
  	}
  
! 	String getIfDescr() {
  		return ifDescr;
  	}
  
! 	void setIfDescr(String ifDescr) {
  		this.ifDescr = ifDescr;
  	}
  
! 	boolean isValid() {
  		return valid;
  	}
  
! 	void setValid(boolean valid) {
  		this.valid = valid;
  	}
  
! 	long getTimestamp() {
  		return timestamp;
  	}
  
! 	void setTimestamp(long timestamp) {
  		this.timestamp = timestamp;
  	}
  
! 	long getIfInOctets() {
  		return ifInOctets;
  	}
  
! 	void setIfInOctets(long ifInOctets) {
  		this.ifInOctets = ifInOctets;
  	}
  
! 	long getIfOutOctets() {
  		return ifOutOctets;
  	}
  
! 	void setIfOutOctets(long ifOutOctets) {
  		this.ifOutOctets = ifOutOctets;
  	}
  
! 	long getSysUpTime() {
  		return sysUpTime;
  	}
  
! 	void setSysUpTime(long sysUpTime) {
  		this.sysUpTime = sysUpTime;
  	}
  
! 	int getIfOperStatus() {
  		return ifOperStatus;
  	}
  
! 	void setIfOperStatus(int ifOperStatus) {
  		this.ifOperStatus = ifOperStatus;
  	}

Index: RrdWriter.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/mrtg/server/RrdWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RrdWriter.java	7 Apr 2004 13:46:05 -0000	1.3
--- RrdWriter.java	19 Apr 2004 13:45:39 -0000	1.4
***************
*** 145,161 ****
  	}
  
! 	public int getSampleCount() {
  		return sampleCount;
  	}
  
! 	public int getBadSavesCount() {
  		return badSavesCount;
  	}
  
! 	public int getGoodSavesCount() {
  		return goodSavesCount;
  	}
  
! 	public int getSavesCount() {
  		return getGoodSavesCount() + getBadSavesCount();
  	}
--- 145,161 ----
  	}
  
! 	int getSampleCount() {
  		return sampleCount;
  	}
  
! 	int getBadSavesCount() {
  		return badSavesCount;
  	}
  
! 	int getGoodSavesCount() {
  		return goodSavesCount;
  	}
  
! 	int getSavesCount() {
  		return getGoodSavesCount() + getBadSavesCount();
  	}