ccmtools-cvs

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3367/src/ccmtools/generator/java/templates/jet

Modified Files:
	UsesDefMultipleEquivalentMethodAdapterLocal.jet 
	ProvidesDefEquivalentMethodAdapterLocal.jet 
	UsesDefEquivalentMethodAdapterLocal.jet 
Log Message:
component adapter now uses ComponentDelegator 

Index: UsesDefMultipleEquivalentMethodAdapterLocal.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/UsesDefMultipleEquivalentMethodAdapterLocal.jet,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UsesDefMultipleEquivalentMethodAdapterLocal.jet	20 Mar 2007 10:55:59 -0000	1.4
--- UsesDefMultipleEquivalentMethodAdapterLocal.jet	20 Mar 2007 14:05:21 -0000	1.5
***************
*** 16,26 ****
          {
              throw new Components.InvalidConnection();
!         }	
          else
          {
!             Components.Cookie ck = new Components.CookieImpl();            
!             <%=uses.getIdentifier()%>ReceptacleMap.put(ck, obj);
!             return ck;
          }
      }
  
--- 16,42 ----
          {
              throw new Components.InvalidConnection();
!         }
!         Components.Cookie ck;
!         if(delegator!=null)
!         {
!         	try
!         	{
!         		ck = delegator.connect("<%=uses.getIdentifier()%>", obj);
!         	}
!         	catch(Components.InvalidName e)
!         	{
!         		throw new Components.InvalidConnection(e.getMessage());
!         	}
!         	catch(Components.AlreadyConnected e)
!         	{
!         		throw new Components.ExceededConnectionLimit(e.getMessage());
!         	}
!         }
          else
          {
!             ck = new Components.CookieImpl();            
          }
+         <%=uses.getIdentifier()%>ReceptacleMap.put(ck, obj);
+         return ck;
      }
  
***************
*** 29,42 ****
      {
  	    logger.fine("Cookie = " + ck);        
!         if(ck == null || !<%=uses.getIdentifier()%>ReceptacleMap.containsKey(ck))
          {
              throw new Components.InvalidConnection();
          }
!         else
          {
!             <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>ReceptacleMap.get(ck);
!             <%=uses.getIdentifier()%>ReceptacleMap.remove(ck);
!             return f;
          }
      }
          
--- 45,74 ----
      {
  	    logger.fine("Cookie = " + ck);        
!         if(!<%=uses.getIdentifier()%>ReceptacleMap.containsKey(ck))
          {
              throw new Components.InvalidConnection();
          }
!         if(delegator!=null)
          {
!         	try
!         	{
!         		delegator.disconnect("<%=uses.getIdentifier()%>", ck);
!         	}
!         	catch(Components.InvalidName e)
!         	{
!         		throw new Components.InvalidConnection(e.getMessage());
!         	}
!         	catch(Components.CookieRequired e)
!         	{
!         		throw new Components.InvalidConnection(e.getMessage());
!         	}
!         	catch(Components.NoConnection e)
!         	{
!         		throw new Components.InvalidConnection(e.getMessage());
!         	}
          }
+         <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>ReceptacleMap.get(ck);
+         <%=uses.getIdentifier()%>ReceptacleMap.remove(ck);
+         return f;
      }
          

Index: ProvidesDefEquivalentMethodAdapterLocal.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ProvidesDefEquivalentMethodAdapterLocal.jet,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProvidesDefEquivalentMethodAdapterLocal.jet	22 Feb 2006 13:38:14 -0000	1.2
--- ProvidesDefEquivalentMethodAdapterLocal.jet	20 Mar 2007 14:05:21 -0000	1.3
***************
*** 10,13 ****
--- 10,23 ----
          if(<%=provides.getIdentifier()%>FacetAdapter == null)
          {
+         	if(delegator!=null)
+         	{
+         		Object o = delegator.provide("<%=provides.getIdentifier()%>");
+         		if(o!=null)
+         		{
+         			<%=provides.getIdentifier()%>FacetAdapter =
+         				(<%=provides.getInterface().generateAbsoluteJavaName()%>)o;
+         			return <%=provides.getIdentifier()%>FacetAdapter;
+         		}
+         	}
              <%=provides.getIdentifier()%>FacetAdapter = 
                  new <%=provides.getInterface().generateAbsoluteJavaName()%>Adapter(localInterface.get_<%=provides.getIdentifier()%>());

Index: UsesDefEquivalentMethodAdapterLocal.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/UsesDefEquivalentMethodAdapterLocal.jet,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UsesDefEquivalentMethodAdapterLocal.jet	20 Mar 2007 10:55:59 -0000	1.4
--- UsesDefEquivalentMethodAdapterLocal.jet	20 Mar 2007 14:05:21 -0000	1.5
***************
*** 10,21 ****
      {
          logger.fine("obj = " + localObj);
!         if(<%=uses.getIdentifier()%>Receptacle != null)
          {
!             throw new Components.AlreadyConnected();
!         }	
          else
          {
!             <%=uses.getIdentifier()%>Receptacle = localObj;
          }
      }
  
--- 10,36 ----
      {
          logger.fine("obj = " + localObj);
!         if(delegator!=null)
          {
!         	try
!         	{
!         		delegator.connect("<%=uses.getIdentifier()%>", localObj);
!         	}
!         	catch(Components.InvalidName e)
!         	{
!         		throw new Components.InvalidConnection(e.getMessage());
!         	}
!         	catch(Components.ExceededConnectionLimit e)
!         	{
!         		throw new Components.AlreadyConnected(e.getMessage());
!         	}
!         }
          else
          {
!             if(<%=uses.getIdentifier()%>Receptacle != null)
!             {
!                 throw new Components.AlreadyConnected();
!             }	
          }
+         <%=uses.getIdentifier()%>Receptacle = localObj;
      }
  
***************
*** 24,37 ****
      {
          logger.fine("");
!         if(<%=uses.getIdentifier()%>Receptacle == null)
          {
!             throw new Components.NoConnection();
          }
          else
          {
!             <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>Receptacle;
!             <%=uses.getIdentifier()%>Receptacle = null;
!             return f;
          }
      }
          
--- 39,71 ----
      {
          logger.fine("");
!         if(delegator!=null)
          {
!         	try
!         	{
!         		delegator.disconnect("<%=uses.getIdentifier()%>", null);
!         	}
!         	catch(Components.InvalidName e)
!         	{
!         		throw new Components.NoConnection(e.getMessage());
!         	}
!         	catch(Components.InvalidConnection e)
!         	{
!         		throw new Components.NoConnection(e.getMessage());
!         	}
!         	catch(Components.CookieRequired e)
!         	{
!         		throw new Components.NoConnection(e.getMessage());
!         	}
          }
          else
          {
!             if(<%=uses.getIdentifier()%>Receptacle == null)
!             {
!                 throw new Components.NoConnection();
!             }
          }
+         <%=uses.getInterface().generateAbsoluteJavaName()%> f = <%=uses.getIdentifier()%>Receptacle;
+         <%=uses.getIdentifier()%>Receptacle = null;
+         return f;
      }