mirror of
https://git.freebsd.org/ports.git
synced 2025-05-12 23:31:50 -04:00
19a4f0ddb2
- Fixed patches for portlint - Supressed debug message on RXTXPort:removeEventListener:Exit when not in debug mode - Added java bootstrap class - Updated java source/target directives which will be depreciated in future release, see http://openjdk.java.net/ +jeps/182, and regression tested functionality. PR: 216248 Submitted by: james@elstone.net Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D9508
108 lines
3.2 KiB
Java
108 lines
3.2 KiB
Java
--- src/gnu/io/CommPortEnumerator.java.orig 2007-04-26 05:26:05 UTC
|
|
+++ src/gnu/io/CommPortEnumerator.java
|
|
@@ -69,50 +69,79 @@ import java.util.Enumeration;
|
|
class CommPortEnumerator implements Enumeration
|
|
{
|
|
private CommPortIdentifier index;
|
|
- private final static boolean debug = false;
|
|
+ private final static boolean debug = "true".equals( System.getProperty( "gnu.io.rxtx.DEBUG" ) );
|
|
static
|
|
{
|
|
- if (debug)
|
|
- System.out.println("CommPortEnumerator:{}");
|
|
+ if (debug) System.out.println("CommPortEnumerator:Static{}");
|
|
}
|
|
|
|
CommPortEnumerator()
|
|
{
|
|
}
|
|
-/*------------------------------------------------------------------------------
|
|
- nextElement()
|
|
- accept:
|
|
- perform:
|
|
- return:
|
|
- exceptions:
|
|
- comments:
|
|
-------------------------------------------------------------------------------*/
|
|
+
|
|
public Object nextElement()
|
|
{
|
|
- if(debug) System.out.println("CommPortEnumerator:nextElement()");
|
|
+ if (debug) System.out.println("CommPortEnumerator:nextElement()");
|
|
+
|
|
synchronized (CommPortIdentifier.Sync)
|
|
{
|
|
- if(index != null) index = index.next;
|
|
- else index=CommPortIdentifier.CommPortIndex;
|
|
+ if(index != null)
|
|
+ {
|
|
+ index = index.next;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ index=CommPortIdentifier.CommPortIndex;
|
|
+ }
|
|
+ if (debug) System.out.println(" CommPortEnumerator:nextElement(" + index + ")");
|
|
return(index);
|
|
}
|
|
}
|
|
-/*------------------------------------------------------------------------------
|
|
- hasMoreElements()
|
|
- accept:
|
|
- perform:
|
|
- return:
|
|
- exceptions:
|
|
- comments:
|
|
-------------------------------------------------------------------------------*/
|
|
+
|
|
public boolean hasMoreElements()
|
|
{
|
|
- if(debug) System.out.println("CommPortEnumerator:hasMoreElements() " + CommPortIdentifier.CommPortIndex == null ? false : true );
|
|
+ if (debug) System.out.println("CommPortEnumerator:hasMoreElements()");
|
|
+
|
|
+ if (CommPortIdentifier.CommPortIndex == null)
|
|
+ {
|
|
+ if (debug) System.out.println(" ComPortIndex is null...");
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (debug) System.out.println(" ComPortIndex is not null...");
|
|
+ }
|
|
+
|
|
synchronized (CommPortIdentifier.Sync)
|
|
{
|
|
- if(index != null) return index.next == null ? false : true;
|
|
- else return CommPortIdentifier.CommPortIndex == null ?
|
|
- false : true;
|
|
+ if (debug) System.out.println(" Syncronised");
|
|
+ if(index != null)
|
|
+ {
|
|
+ if (debug) System.out.println(" Valid index");
|
|
+ if (index.next == null)
|
|
+ {
|
|
+ if (debug) System.out.println("CommPortEnumerator:hasMoreElements: Exit(Next index is null - false)");
|
|
+ return false;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (debug) System.out.println("CommPortEnumerator:hasMoreElements: Exit(Next index is not null - true)");
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (debug) System.out.println(" Index is not valid");
|
|
+ if (CommPortIdentifier.CommPortIndex == null)
|
|
+ {
|
|
+ if (debug) System.out.println("CommPortEnumerator:hasMoreElements: Exit(CommPortIdentifier.CommPortIndex is null - false)");
|
|
+ return false;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (debug) System.out.println("CommPortEnumerator:hasMoreElements: Exit(CommPortIdentifier.CommPortIndex is not null - true)");
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
}
|