[ccmtools-cvs] ccmtools/src/ccmtools/generator/java/templates/jet ComponentDefAdapterLocal.jet, 1.14, 1.15

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

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

Modified Files:
	ComponentDefAdapterLocal.jet 
Log Message:
no generated 'import' statements

Index: ComponentDefAdapterLocal.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ComponentDefAdapterLocal.jet,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ComponentDefAdapterLocal.jet	10 Jan 2007 16:19:14 -0000	1.14
--- ComponentDefAdapterLocal.jet	20 Mar 2007 08:11:51 -0000	1.15
***************
*** 12,32 ****
  package <%=component.generateJavaNamespace()%>;
  
- import java.util.logging.Logger;
- 
- import Components.AlreadyConnected;
- import Components.Assembly;
- import Components.CCMException;     
- import Components.CCMHome;
- import Components.Cookie;
- import Components.CookieImpl;
- import Components.CookieRequired;
- import Components.ExceededConnectionLimit;
- import Components.InvalidConfiguration;
- import Components.InvalidConnection;
- import Components.InvalidName;
- import Components.NoConnection;
- import Components.RemoveFailure;
- import ccmtools.local.ServiceLocator;
- 
  <%=component.generateJavaImportStatements()%>  
                   
--- 12,15 ----
***************
*** 34,42 ****
      implements <%=component.getIdentifier()%>
  {
!     private Logger logger = ServiceLocator.instance().getLogger();
      
      private <%=component.generateCcmIdentifier()%> localInterface;
      private <%=component.generateCcmIdentifier()%>_Context ctx;
!     private Assembly assembly;
  
      /** Facet adapter references */
--- 17,25 ----
      implements <%=component.getIdentifier()%>
  {
!     private java.util.logging.Logger logger = ccmtools.local.ServiceLocator.instance().getLogger();
      
      private <%=component.generateCcmIdentifier()%> localInterface;
      private <%=component.generateCcmIdentifier()%>_Context ctx;
!     private Components.Assembly assembly;
  
      /** Facet adapter references */
***************
*** 73,77 ****
      }
  	
!     public <%=component.getIdentifier()%>Adapter(<%=component.generateCcmIdentifier()%> localInterface, Assembly assembly)
      {
          logger.fine("localInterface = " + localInterface + ", " + assembly);
--- 56,60 ----
      }
  	
!     public <%=component.getIdentifier()%>Adapter(<%=component.generateCcmIdentifier()%> localInterface, Components.Assembly assembly)
      {
          logger.fine("localInterface = " + localInterface + ", " + assembly);
***************
*** 157,161 ****
  	
      public void configuration_complete()
!         throws InvalidConfiguration
      {
          logger.fine("");
--- 140,144 ----
  	
      public void configuration_complete()
!         throws Components.InvalidConfiguration
      {
          logger.fine("");
***************
*** 170,181 ****
              localInterface.ccm_activate();
          }
!         catch(CCMException e)
          {
!             throw new InvalidConfiguration();
          }
      }
  
      public void remove()
!         throws RemoveFailure
      { 
          logger.fine("");
--- 153,164 ----
              localInterface.ccm_activate();
          }
!         catch(Components.CCMException e)
          {
!             throw new Components.InvalidConfiguration();
          }
      }
  
      public void remove()
!         throws Components.RemoveFailure
      { 
          logger.fine("");
***************
*** 189,199 ****
              }
          }
!         catch(CCMException e)
          {
!             throw new RemoveFailure();
          }
      }
      
!     public CCMHome get_ccm_home()
      {
          throw new RuntimeException("Not implemented!");
--- 172,182 ----
              }
          }
!         catch(Components.CCMException e)
          {
!             throw new Components.RemoveFailure();
          }
      }
      
!     public Components.CCMHome get_ccm_home()
      {
          throw new RuntimeException("Not implemented!");
***************
*** 204,213 ****
      
      public Object provide_facet(String name)
!         throws InvalidName
      {
          logger.fine("name = " + name);
          if(name == null)
          {
!             throw new InvalidName();
          }
  <%
--- 187,196 ----
      
      public Object provide_facet(String name)
!         throws Components.InvalidName
      {
          logger.fine("name = " + name);
          if(name == null)
          {
!             throw new Components.InvalidName();
          }
  <%
***************
*** 220,224 ****
  }
  %>   
!         throw new InvalidName();
      }
      
--- 203,207 ----
  }
  %>   
!         throw new Components.InvalidName();
      }
      
***************
*** 226,241 ****
      /** Receptacle methods */
      
!     public Cookie connect(String name, Object obj)
!         throws InvalidName, InvalidConnection, 
!         AlreadyConnected, ExceededConnectionLimit
      {
          logger.fine("name = " + name + ", obj = " + obj);
          if(name == null)
          {
!             throw new InvalidName();
          }
          if(obj == null)
          {
!             throw new InvalidConnection();
          }    
  <%
--- 209,224 ----
      /** Receptacle methods */
      
!     public Components.Cookie connect(String name, Object obj)
!         throws Components.InvalidName, Components.InvalidConnection, 
!         Components.AlreadyConnected, Components.ExceededConnectionLimit
      {
          logger.fine("name = " + name + ", obj = " + obj);
          if(name == null)
          {
!             throw new Components.InvalidName();
          }
          if(obj == null)
          {
!             throw new Components.InvalidConnection();
          }    
  <%
***************
*** 250,269 ****
          else
          {
!             throw new InvalidName();
          }
      }
      
!     public void disconnect(String name, Cookie ck)
!         throws InvalidName, InvalidConnection, 
!         CookieRequired, NoConnection
      {
          logger.fine("name = " + name + ", ck = " + ck );
          if(name == null)
          {
!             throw new InvalidName();
          }
          if(ck == null)
          {
!             throw new CookieRequired();
          } 
  <%
--- 233,252 ----
          else
          {
!             throw new Components.InvalidName();
          }
      }
      
!     public void disconnect(String name, Components.Cookie ck)
!         throws Components.InvalidName, Components.InvalidConnection, 
!         Components.CookieRequired, Components.NoConnection
      {
          logger.fine("name = " + name + ", ck = " + ck );
          if(name == null)
          {
!             throw new Components.InvalidName();
          }
          if(ck == null)
          {
!             throw new Components.CookieRequired();
          } 
  <%
***************
*** 278,282 ****
          else
          {
!             throw new InvalidName();
          }
      }    
--- 261,265 ----
          else
          {
!             throw new Components.InvalidName();
          }
      }