User: reverbel
Date: 02/02/18 14:20:44
Modified: iiop/src/main/org/jboss/iiop/rmi/ir ConstantDefImpl.java
ContainedImpl.java ContainerImplDelegate.java
IRObjectImpl.java InterfaceDefImpl.java
InterfaceRepository.java RepositoryImpl.java
ValueDefImpl.java
Log:
System.err calls replaced by logger calls, tabs removed, indentation
changes.
Revision Changes Path
1.3 +17 -15 contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ConstantDefImpl.java
Index: ConstantDefImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ConstantDefImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConstantDefImpl.java 8 Aug 2001 20:19:39 -0000 1.2
+++ ConstantDefImpl.java 18 Feb 2002 22:20:44 -0000 1.3
@@ -25,7 +25,7 @@
* Constant IR object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ConstantDefImpl
extends ContainedImpl
@@ -37,6 +37,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(ConstantDefImpl.class);
+
// Constructors --------------------------------------------------
ConstantDefImpl(String id, String name, String version,
@@ -69,10 +72,10 @@
{
// Get my type definition: It should have been created now.
type_def = IDLTypeImpl.getIDLType(typeCode, repository);
-if (type_def == null)
-System.err.println("Got type_def: [NULL]");
-else
-System.err.println("Got type_def: [" + type_def.toString() + "]");
+ if (type_def == null)
+ logger.debug("Got type_def: [NULL]");
+ else
+ logger.debug("Got type_def: [" + type_def.toString() + "]");
getReference();
}
@@ -82,18 +85,18 @@
public TypeCode type()
{
-System.err.println("ConstantDefImpl.type(): entered.");
+ logger.debug("ConstantDefImpl.type(): entered.");
return typeCode;
}
public IDLType type_def()
{
-System.err.println("ConstantDefImpl.type_def(): entered.");
-try {
- return IDLTypeHelper.narrow(type_def.getReference());
-} finally {
-System.err.println("ConstantDefImpl.type_def(): returning.");
-}
+ logger.debug("ConstantDefImpl.type_def(): entered.");
+ try {
+ return IDLTypeHelper.narrow(type_def.getReference());
+ } finally {
+ logger.debug("ConstantDefImpl.type_def(): returning.");
+ }
}
public void type_def(IDLType arg)
@@ -103,7 +106,7 @@
public Any value()
{
-System.err.println("ConstantDefImpl.value(): entered.");
+ logger.debug("ConstantDefImpl.value(): entered.");
return value;
}
@@ -117,7 +120,7 @@
public Description describe()
{
-System.err.println("ConstantDefImpl.describe(): entered.");
+ logger.debug("ConstantDefImpl.describe(): entered.");
String defined_in_id = "IR";
if (defined_in instanceof ContainedOperations)
@@ -166,4 +169,3 @@
// Inner classes -------------------------------------------------
}
-
1.4 +12 -9 contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ContainedImpl.java
Index: ContainedImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ContainedImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainedImpl.java 8 Aug 2001 20:19:39 -0000 1.3
+++ ContainedImpl.java 18 Feb 2002 22:20:44 -0000 1.4
@@ -23,7 +23,7 @@
* Abstract base class for all contained IR entities.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
abstract class ContainedImpl
extends IRObjectImpl
@@ -35,6 +35,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(ContainedImpl.class);
+
// Constructors --------------------------------------------------
ContainedImpl(String id, String name, String version,
@@ -60,7 +63,7 @@
public java.lang.String id()
{
-//System.err.println("ContainedImpl["+id+"].id() entered.");
+ logger.trace("ContainedImpl[" + id + "].id() entered.");
return id;
}
@@ -71,7 +74,7 @@
public java.lang.String name()
{
-//System.err.println("ContainedImpl["+id+"].name() entered.");
+ logger.trace("ContainedImpl[" + id + "].name() entered.");
return name;
}
@@ -82,7 +85,7 @@
public java.lang.String version()
{
-//System.err.println("ContainedImpl["+id+"].version() entered.");
+ logger.trace("ContainedImpl[" + id + "].version() entered.");
return version;
}
@@ -93,20 +96,21 @@
public Container defined_in()
{
-System.err.println("ContainedImpl["+id+"].defined_in() entered.");
+ logger.debug("ContainedImpl[" + id + "].defined_in() entered.");
return ContainerHelper.narrow(defined_in.getReference());
}
public java.lang.String absolute_name()
{
-//System.err.println("ContainedImpl["+id+"].absolute_name() returning \"" +
-// absolute_name + "\".");
+ logger.trace("ContainedImpl[" + id + "].absolute_name() returning \"" +
+ absolute_name + "\".");
return absolute_name;
}
public Repository containing_repository()
{
-System.err.println("ContainedImpl["+id+"].containing_repository() entered.");
+ logger.debug("ContainedImpl[" + id +
+ "].containing_repository() entered.");
return RepositoryHelper.narrow(repository.getReference());
}
@@ -168,4 +172,3 @@
// Inner classes -------------------------------------------------
}
-
1.3 +13 -9
contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ContainerImplDelegate.java
Index: ContainerImplDelegate.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ContainerImplDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerImplDelegate.java 8 Aug 2001 20:19:39 -0000 1.2
+++ ContainerImplDelegate.java 18 Feb 2002 22:20:44 -0000 1.3
@@ -40,7 +40,7 @@
* Delegate for Container functionality.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
class ContainerImplDelegate
implements ContainerOperations
@@ -51,6 +51,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(ContainerImplDelegate.class);
+
// Constructors --------------------------------------------------
/**
@@ -67,14 +70,16 @@
public LocalContained _lookup(String search_name)
{
-System.err.println("ContainerImplDelegate._lookup(\""+search_name+"\") entered.");
+ logger.debug("ContainerImplDelegate._lookup(\"" + search_name +
+ "\") entered.");
if (search_name.startsWith("::"))
return delegateFor.getRepository()._lookup(search_name.substring(2));
int idx = search_name.indexOf("::");
if (idx > 0) {
String first = search_name.substring(0, idx);
-System.err.println("ContainerImplDelegate._lookup(\""+search_name+"\") looking for
\""+first+"\".");
+ logger.debug("ContainerImplDelegate._lookup(\"" + search_name +
+ "\") looking for \"" + first + "\".");
Object o = contMap.get(first);
if (o == null || !(o instanceof LocalContainer))
@@ -319,7 +324,7 @@
throw new IRConstructionException("Duplicate name: " + name);
cont.add(contained);
contMap.put(name, contained);
-System.err.println("ContainerDelegateImpl.add() added \""+name+"\".");
+ logger.debug("ContainerDelegateImpl.add() added \"" + name + "\".");
}
/**
@@ -328,15 +333,15 @@
void allDone()
throws IRConstructionException
{
-System.err.println("ContainerDelegateImpl.allDone() entered ");
+ logger.debug("ContainerDelegateImpl.allDone() entered ");
for (int i = 0; i < cont.size(); ++i) {
LocalContained item = (LocalContained)cont.get(i);
-System.err.println("Container["+item.id()+"].allDone() calling [" +
- item.id() + "].allDone()");
+ logger.debug("Container[" + item.id() + "].allDone() calling [" +
+ item.id() + "].allDone()");
item.allDone();
}
-System.err.println("ContainerDelegateImpl.allDone() done ");
+ logger.debug("ContainerDelegateImpl.allDone() done ");
}
// Protected -----------------------------------------------------
@@ -361,4 +366,3 @@
// Inner classes -------------------------------------------------
}
-
1.4 +12 -10 contrib/iiop/src/main/org/jboss/iiop/rmi/ir/IRObjectImpl.java
Index: IRObjectImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/IRObjectImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IRObjectImpl.java 8 Aug 2001 20:19:39 -0000 1.3
+++ IRObjectImpl.java 18 Feb 2002 22:20:44 -0000 1.4
@@ -25,7 +25,7 @@
* Abstract base class for all IR object implementations.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
abstract class IRObjectImpl
implements IRObjectOperations
@@ -40,6 +40,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(IRObjectImpl.class);
+
// Constructors --------------------------------------------------
IRObjectImpl(DefinitionKind def_kind, RepositoryImpl repository)
@@ -54,7 +57,7 @@
public DefinitionKind def_kind()
{
-//System.err.println("IRObjectImpl.def_kind() entered.");
+ logger.trace("IRObjectImpl.def_kind() entered.");
return def_kind;
}
@@ -132,22 +135,22 @@
// repository.poa.activate_object_with_id(getObjectId(), servant);
// return repository.poa.id_to_reference(getObjectId());
-System.err.println("#### IRObject.srv2ref: id=[" + new String(id) + "]");
+ logger.debug("#### IRObject.srv2ref: id=[" + new String(id) + "]");
repository.poa.activate_object_with_id(id, servant);
org.omg.CORBA.Object ref = repository.poa.id_to_reference(id);
-System.err.println("#### IRObject.srv2ref: returning ref.");
+ logger.debug("#### IRObject.srv2ref: returning ref.");
//return repository.poa.id_to_reference(id);
return ref;
} catch (WrongPolicy ex) {
- ex.printStackTrace();
+ logger.debug("Exception converting CORBA servant to reference", ex);
} catch (ServantAlreadyActive ex) {
- ex.printStackTrace();
+ logger.debug("Exception converting CORBA servant to reference", ex);
} catch (ObjectAlreadyActive ex) {
- ex.printStackTrace();
+ logger.debug("Exception converting CORBA servant to reference", ex);
} catch (ObjectNotActive ex) {
- ex.printStackTrace();
+ logger.debug("Exception converting CORBA servant to reference", ex);
// } catch (ServantNotActive ex) {
-// ex.printStackTrace();
+// logger.debug("Exception converting CORBA servant to reference", ex);
}
return null;
}
@@ -156,4 +159,3 @@
// Inner classes -------------------------------------------------
}
-
1.3 +24 -19
contrib/iiop/src/main/org/jboss/iiop/rmi/ir/InterfaceDefImpl.java
Index: InterfaceDefImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/InterfaceDefImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InterfaceDefImpl.java 8 Aug 2001 20:19:39 -0000 1.2
+++ InterfaceDefImpl.java 18 Feb 2002 22:20:44 -0000 1.3
@@ -48,7 +48,7 @@
* Interface IR object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
class InterfaceDefImpl
extends ContainedImpl
@@ -60,6 +60,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(InterfaceDefImpl.class);
+
// Constructors --------------------------------------------------
InterfaceDefImpl(String id, String name, String version,
@@ -131,24 +134,27 @@
public Contained lookup(String search_name)
{
-System.err.println("InterfaceDefImpl.lookup(\""+search_name+"\") entered.");
-Contained res = delegate.lookup(search_name);
-System.err.println("InterfaceDefImpl.lookup(\""+search_name+
- "\") returning " + ((res == null) ? "null" : "non-null") );
-return res;
-// return delegate.lookup(search_name);
+ logger.debug("InterfaceDefImpl.lookup(\"" + search_name +
+ "\") entered.");
+ Contained res = delegate.lookup(search_name);
+ logger.debug("InterfaceDefImpl.lookup(\"" + search_name +
+ "\") returning " + ((res == null) ? "null" : "non-null") );
+ return res;
+ //return delegate.lookup(search_name);
}
public Contained[] contents(DefinitionKind limit_type,
boolean exclude_inherited)
{
-System.err.println("InterfaceDefImpl.contents() entered.");
+ logger.debug("InterfaceDefImpl.contents() entered.");
Contained[] res = delegate.contents(limit_type, exclude_inherited);
-System.err.println("InterfaceDefImpl.contents() "+res.length+" contained to
return.");
-for (int i = 0; i < res.length; ++i)
-System.err.println(" InterfaceDefImpl.contents() ["+i+"]: " + res[i].id());
+ logger.debug("InterfaceDefImpl.contents() " + res.length +
+ " contained to return.");
+ for (int i = 0; i < res.length; ++i)
+ logger.debug(" InterfaceDefImpl.contents() [" + i + "]: " +
+ res[i].id());
return res;
-// return delegate.contents(limit_type, exclude_inherited);
+ //return delegate.contents(limit_type, exclude_inherited);
}
public Contained[] lookup_name(String search_name, int levels_to_search,
@@ -251,14 +257,14 @@
if (base_interfaces_ref == null) {
base_interfaces_ref = new InterfaceDef[base_interfaces.length];
for (int i = 0; i < base_interfaces_ref.length; ++i) {
-System.err.println("InterfaceDefImpl.base_interfaces(): " +
- "looking up \""+base_interfaces[i]+"\".");
+ logger.debug("InterfaceDefImpl.base_interfaces(): " +
+ "looking up \"" + base_interfaces[i] + "\".");
Contained c = repository.lookup_id(base_interfaces[i]);
-System.err.println("InterfaceDefImpl.base_interfaces(): " +
- "Got: " + ((c==null)?"null":c.id()) );
+ logger.debug("InterfaceDefImpl.base_interfaces(): " +
+ "Got: " + ((c==null)? "null" : c.id()));
base_interfaces_ref[i] = InterfaceDefHelper.narrow(c);
-System.err.println("InterfaceDefImpl.base_interfaces(): " +
- "ref: " + ((c==null)?"null":"not null") );
+ logger.debug("InterfaceDefImpl.base_interfaces(): " +
+ "ref: " + ((c==null)? "null" : "not null"));
}
}
@@ -405,4 +411,3 @@
// Inner classes -------------------------------------------------
}
-
1.4 +28 -23
contrib/iiop/src/main/org/jboss/iiop/rmi/ir/InterfaceRepository.java
Index: InterfaceRepository.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/InterfaceRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InterfaceRepository.java 8 Aug 2001 20:19:39 -0000 1.3
+++ InterfaceRepository.java 18 Feb 2002 22:20:44 -0000 1.4
@@ -52,7 +52,7 @@
* An Interface Repository.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class InterfaceRepository
{
@@ -65,12 +65,12 @@
/**
* Maps java classes to IDL TypeCodes for primitives.
*/
- static private Map primitiveTypeCodeMap;
+ private static Map primitiveTypeCodeMap;
/**
* Maps java classes to IDL TypeCodes for constants.
*/
- static private Map constantTypeCodeMap;
+ private static Map constantTypeCodeMap;
static {
// Get an ORB for creating type codes.
@@ -107,6 +107,12 @@
constantTypeCodeMap.put(String.class, orb.create_wstring_tc(0));
}
+ /**
+ * Static logger used by the interface repository.
+ */
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(InterfaceRepository.class);
+
// Constructors --------------------------------------------------
public InterfaceRepository(ORB orb, POA poa)
@@ -328,7 +334,7 @@
throw new IllegalArgumentException("Class " + cls.getName() +
" already has TypeCode.");
-//System.err.println("InterfaceRepository: added typecode for " + cls.getName());
+ logger.trace("InterfaceRepository: added typecode for " + cls.getName());
typeCodeMap.put(cls, typeCode);
}
@@ -463,10 +469,10 @@
// Warn if it does not conform to the specification.
if
(!"RMI:javax.rmi.CORBA.ClassDesc:B7C4E3FC9EBDC311:CFBF02CF5294176B".equals(val.id()) )
- System.err.println("Compatibility problem: Class " +
- "javax.rmi.CORBA.ClassDesc does not conform " +
- "to the Java(TM) Language to IDL Mapping "+
- "Specification (01-06-07), section 1.3.5.11.");
+ logger.debug("Compatibility problem: Class " +
+ "javax.rmi.CORBA.ClassDesc does not conform " +
+ "to the Java(TM) Language to IDL Mapping "+
+ "Specification (01-06-07), section 1.3.5.11.");
javaxRmiCORBAClassDesc = val;
}
@@ -542,7 +548,7 @@
// Create module
ModuleDefImpl m = new ModuleDefImpl(id, base, "1.0", c, impl);
-// System.err.println("Created module \"" + id + "\".");
+ logger.trace("Created module \"" + id + "\".");
c.add(base, m);
@@ -571,13 +577,13 @@
String cName = consts[i].getIDLName();
Class cls = consts[i].getType();
-// System.err.println("Constant["+i+"] class: " + cls.getName());
+ logger.trace("Constant["+i+"] class: " + cls.getName());
TypeCode typeCode = getConstantTypeCode(cls);
Any value = orb.create_any();
consts[i].insertValue(value);
-// System.err.println("Adding constant: " + cid);
+ logger.trace("Adding constant: " + cid);
cDef = new ConstantDefImpl(cid, cName, "1.0",
typeCode, value, container, impl);
container.add(cName, cDef);
@@ -592,18 +598,18 @@
throws RMIIIOPViolationException, IRConstructionException
{
AttributeAnalysis[] attrs = ca.getAttributes();
-// System.err.println("Attribute count: " + attrs.length);
+ logger.trace("Attribute count: " + attrs.length);
for (int i = 0; i < attrs.length; ++i) {
AttributeDefImpl aDef;
String aid = ca.getMemberRepositoryId(attrs[i].getJavaName());
String aName = attrs[i].getIDLName();
Class cls = attrs[i].getCls();
-// System.err.println("Attribute["+i+"] class: " + cls.getName());
+ logger.trace("Attribute["+i+"] class: " + cls.getName());
TypeCode typeCode = getTypeCode(cls);
-// System.err.println("Adding: " + aid);
+ logger.trace("Adding: " + aid);
aDef = new AttributeDefImpl(aid, aName, "1.0", attrs[i].getMode(),
typeCode, container, impl);
container.add(aName, aDef);
@@ -618,14 +624,14 @@
throws RMIIIOPViolationException, IRConstructionException
{
OperationAnalysis[] ops = ca.getOperations();
-System.err.println("Operation count: " + ops.length);
+ logger.debug("Operation count: " + ops.length);
for (int i = 0; i < ops.length; ++i) {
OperationDefImpl oDef;
String oName = ops[i].getIDLName();
String oid = ca.getMemberRepositoryId(oName);
Class cls = ops[i].getReturnType();
-System.err.println("Operation["+i+"] return type class: " + cls.getName());
+ logger.debug("Operation["+i+"] return type class: " + cls.getName());
TypeCode typeCode = getTypeCode(cls);
ParameterAnalysis[] ps = ops[i].getParameters();
@@ -644,7 +650,7 @@
exceptions[j] = ExceptionDefHelper.narrow(e.getReference());
}
-System.err.println("Adding: " + oid);
+ logger.debug("Adding: " + oid);
oDef = new OperationDefImpl(oid, oName, "1.0", container,
typeCode, params, exceptions, impl);
container.add(oName, oDef);
@@ -906,7 +912,7 @@
baseTypeCode,
impl);
addTypeCode(cls, vDef.type());
-System.err.println("Value: base=" + base);
+ logger.debug("Value: base=" + base);
m.add(base, vDef);
valueMap.put(cls, vDef); // Remember we mapped this.
@@ -915,19 +921,19 @@
// Add value members
ValueMemberAnalysis[] vmas = va.getMembers();
-System.err.println("Value member count: " + vmas.length);
+ logger.debug("Value member count: " + vmas.length);
for (int i = 0; i < vmas.length; ++i) {
ValueMemberDefImpl vmDef;
String vmid = va.getMemberRepositoryId(vmas[i].getJavaName());
String vmName = vmas[i].getIDLName();
Class vmCls = vmas[i].getCls();
-System.err.println("ValueMembers["+i+"] class: " + vmCls.getName());
+ logger.debug("ValueMembers["+i+"] class: " + vmCls.getName());
TypeCode typeCode = getTypeCode(vmCls);
boolean vmPublic = vmas[i].isPublic();
-System.err.println("Adding value member: " + vmid);
+ logger.debug("Adding value member: " + vmid);
vmDef = new ValueMemberDefImpl(vmid, vmName, "1.0",
typeCode, vmPublic, vDef, impl);
vDef.add(vmName, vmDef);
@@ -974,7 +980,7 @@
eDef = new ExceptionDefImpl(ea.getExceptionRepositoryId(), base, "1.0",
typeCode, vDef, m, impl);
-System.err.println("Exception: base=" + base);
+ logger.debug("Exception: base=" + base);
m.add(base, eDef);
exceptionMap.put(cls, eDef); // Remember we mapped this.
@@ -984,4 +990,3 @@
// Inner classes -------------------------------------------------
}
-
1.4 +12 -8 contrib/iiop/src/main/org/jboss/iiop/rmi/ir/RepositoryImpl.java
Index: RepositoryImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/RepositoryImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepositoryImpl.java 8 Aug 2001 20:19:39 -0000 1.3
+++ RepositoryImpl.java 18 Feb 2002 22:20:44 -0000 1.4
@@ -40,7 +40,7 @@
* An Interface Repository.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
class RepositoryImpl
extends ContainerImpl
@@ -52,6 +52,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(RepositoryImpl.class);
+
// Constructors --------------------------------------------------
public RepositoryImpl(ORB orb, POA poa)
@@ -92,7 +95,7 @@
public Contained lookup_id(java.lang.String search_id)
{
-System.err.println("RepositoryImpl.lookup_id(\""+search_id+"\") entered.");
+ logger.debug("RepositoryImpl.lookup_id(\"" + search_id + "\") entered.");
LocalContained c = _lookup_id(search_id);
if (c == null)
@@ -103,14 +106,14 @@
public TypeCode get_canonical_typecode(org.omg.CORBA.TypeCode tc)
{
-System.err.println("RepositoryImpl.get_canonical_typecode() entered.");
+ logger.debug("RepositoryImpl.get_canonical_typecode() entered.");
// TODO
return null;
}
public PrimitiveDef get_primitive(org.omg.CORBA.PrimitiveKind kind)
{
-System.err.println("RepositoryImpl.get_primitive() entered.");
+ logger.debug("RepositoryImpl.get_primitive() entered.");
// TODO
return null;
}
@@ -169,19 +172,21 @@
LocalContained _lookup_id(java.lang.String search_id)
{
-System.err.println("RepositoryImpl._lookup_id(\"" + search_id + "\") entered.");
+ logger.debug("RepositoryImpl._lookup_id(\"" + search_id +
+ "\") entered.");
// mapping of arrays are special
if (search_id.startsWith("RMI:["))
return (ValueBoxDefImpl)sequenceIdMap.get(search_id);
// convert id
String name = scopedName(search_id);
-System.err.println("RepositoryImpl._lookup_id():
scopedName=\""+scopedName(search_id)+"\"");
+ logger.debug("RepositoryImpl._lookup_id(): scopedName=\"" +
+ scopedName(search_id) + "\"");
// look it up if converted id not null
//return (name == null) ? null : _lookup(name);
LocalContained ret = (name == null) ? null : _lookup(name);
-System.err.println("RepositoryImpl._lookup_id(): returning " +
+ logger.debug("RepositoryImpl._lookup_id(): returning " +
((ret == null) ? "null" : "NOT null") );
return ret;
}
@@ -306,4 +311,3 @@
// Inner classes -------------------------------------------------
}
-
1.3 +36 -31 contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ValueDefImpl.java
Index: ValueDefImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/iiop/src/main/org/jboss/iiop/rmi/ir/ValueDefImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValueDefImpl.java 8 Aug 2001 20:19:39 -0000 1.2
+++ ValueDefImpl.java 18 Feb 2002 22:20:44 -0000 1.3
@@ -61,7 +61,7 @@
* Interface IR object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ole Husgaard</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
class ValueDefImpl
extends ContainedImpl
@@ -73,6 +73,9 @@
// Static --------------------------------------------------------
+ private static final org.jboss.logging.Logger logger =
+ org.jboss.logging.Logger.getLogger(ValueDefImpl.class);
+
// Constructors --------------------------------------------------
ValueDefImpl(String id, String name, String version,
@@ -139,26 +142,28 @@
getReference();
delegate.allDone();
-System.err.println("ValueDefImpl.allDone(): baseValueTypeCode is " +
+ logger.debug("ValueDefImpl.allDone(): baseValueTypeCode is " +
((baseValueTypeCode==null) ? "null" : "NOT null") );
-if (baseValueTypeCode != null)
-System.err.println("ValueDefImpl.allDone(): baseValueTypeCode.kind().value()="+
- baseValueTypeCode.kind().value() );
+ if (baseValueTypeCode != null)
+ logger.debug("ValueDefImpl.allDone(): " +
+ "baseValueTypeCode.kind().value()=" +
+ baseValueTypeCode.kind().value() );
if (baseValueTypeCode != null &&
baseValueTypeCode.kind() != TCKind.tk_null) {
try {
baseValue = baseValueTypeCode.id();
-System.err.println("ValueDefImpl.allDone(): baseValue=\""+baseValue+"\".");
+ logger.debug("ValueDefImpl.allDone(): baseValue=\""
+ + baseValue + "\".");
} catch (BadKind ex) {
throw new IRConstructionException(
"Bad kind for super-valuetype of " + id());
}
Contained c = repository.lookup_id(baseValue);
-System.err.println("ValueDefImpl.allDone(): c is " +
- ((c==null) ? "null" : "NOT null") );
+ logger.debug("ValueDefImpl.allDone(): c is " +
+ ((c==null) ? "null" : "NOT null") );
base_value_ref = ValueDefHelper.narrow(c);
-System.err.println("ValueDefImpl.allDone(): base_value_ref is " +
- ((base_value_ref==null) ? "null" : "NOT null") );
+ logger.debug("ValueDefImpl.allDone(): base_value_ref is " +
+ ((base_value_ref==null) ? "null" : "NOT null") );
//base_value_ref = ValueDefHelper.narrow(repository.lookup_id(baseValue));
} else
baseValue = "";
@@ -188,24 +193,25 @@
public Contained lookup(String search_name)
{
-System.err.println("ValueDefImpl.lookup(\""+search_name+"\") entered.");
-Contained res = delegate.lookup(search_name);
-System.err.println("ValueDefImpl.lookup(\""+search_name+
- "\") returning " + ((res == null) ? "null" : "non-null") );
-return res;
-// return delegate.lookup(search_name);
+ logger.debug("ValueDefImpl.lookup(\"" + search_name + "\") entered.");
+ Contained res = delegate.lookup(search_name);
+ logger.debug("ValueDefImpl.lookup(\"" + search_name +
+ "\") returning " + ((res == null) ? "null" : "non-null") );
+ return res;
+ //return delegate.lookup(search_name);
}
-
+
public Contained[] contents(DefinitionKind limit_type,
boolean exclude_inherited)
{
-System.err.println("ValueDefImpl.contents() entered.");
+ logger.debug("ValueDefImpl.contents() entered.");
Contained[] res = delegate.contents(limit_type, exclude_inherited);
-System.err.println("ValueDefImpl.contents() "+res.length+" contained to return.");
-for (int i = 0; i < res.length; ++i)
-System.err.println(" ValueDefImpl.contents() ["+i+"]: " + res[i].id());
+ logger.debug("ValueDefImpl.contents() " + res.length +
+ " contained to return.");
+ for (int i = 0; i < res.length; ++i)
+ logger.debug(" ValueDefImpl.contents() [" + i + "]: " + res[i].id());
return res;
-// return delegate.contents(limit_type, exclude_inherited);
+ //return delegate.contents(limit_type, exclude_inherited);
}
public Contained[] lookup_name(String search_name, int levels_to_search,
@@ -327,12 +333,12 @@
public ValueDef base_value()
{
-System.err.println("ValueDefImpl["+id+"].base_value() entered.");
-if (base_value_ref == null)
- System.err.println("ValueDefImpl["+id+"].base_value() returning NULL.");
-else
- System.err.println("ValueDefImpl["+id+"].base_value() returning \"" +
- base_value_ref.id() + "\".");
+ logger.debug("ValueDefImpl[" + id + "].base_value() entered.");
+ if (base_value_ref == null)
+ logger.debug("ValueDefImpl[" + id + "].base_value() returning NULL.");
+ else
+ logger.debug("ValueDefImpl[" + id + "].base_value() returning \"" +
+ base_value_ref.id() + "\".");
return base_value_ref;
}
@@ -445,7 +451,7 @@
public TypeCode type()
{
-System.err.println("ValueDefImpl.type() entered.");
+ logger.debug("ValueDefImpl.type() entered.");
if (typeCode == null) {
short modifier = VM_NONE.value;
if (is_custom)
@@ -457,7 +463,7 @@
baseValueTypeCode,
getValueMembersForTypeCode());
}
-System.err.println("ValueDefImpl.type() returning.");
+ logger.debug("ValueDefImpl.type() returning.");
return typeCode;
}
@@ -602,4 +608,3 @@
// Inner classes -------------------------------------------------
}
-
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
