From: Robert L. <rle...@us...> - 2007-03-20 08:11:56
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29304/src/ccmtools/generator/java/templates Modified Files: ComponentDefAdapterLocalTemplate.java Log Message: no generated 'import' statements Index: ComponentDefAdapterLocalTemplate.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/ComponentDefAdapterLocalTemplate.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ComponentDefAdapterLocalTemplate.java 10 Jan 2007 16:19:13 -0000 1.15 --- ComponentDefAdapterLocalTemplate.java 20 Mar 2007 08:11:50 -0000 1.16 *************** *** 18,28 **** protected final String TEXT_1 = "/*" + NL + " * This file was automatically generated by "; protected final String TEXT_2 = NL + " * <http://ccmtools.sourceforge.net>" + NL + " * DO NOT EDIT!" + NL + " */" + NL + "" + NL + "package "; ! protected final String TEXT_3 = ";" + NL + "" + NL + "import java.util.logging.Logger;" + NL + "" + NL + "import Components.AlreadyConnected;" + NL + "import Components.Assembly;" + NL + "import Components.CCMException; " + NL + "import Components.CCMHome;" + NL + "import Components.Cookie;" + NL + "import Components.CookieImpl;" + NL + "import Components.CookieRequired;" + NL + "import Components.ExceededConnectionLimit;" + NL + "import Components.InvalidConfiguration;" + NL + "import Components.InvalidConnection;" + NL + "import Components.InvalidName;" + NL + "import Components.NoConnection;" + NL + "import Components.RemoveFailure;" + NL + "import ccmtools.local.ServiceLocator;" + NL; protected final String TEXT_4 = NL; protected final String TEXT_5 = " " + NL + " " + NL + "public class "; protected final String TEXT_6 = "Adapter " + NL + " implements "; ! protected final String TEXT_7 = NL + "{" + NL + " private Logger logger = ServiceLocator.instance().getLogger();" + NL + " " + NL + " private "; protected final String TEXT_8 = " localInterface;" + NL + " private "; ! protected final String TEXT_9 = "_Context ctx;" + NL + " private Assembly assembly;" + NL + "" + NL + " /** Facet adapter references */"; protected final String TEXT_10 = NL; protected final String TEXT_11 = " " + NL + "\t" + NL + " /** Receptacle references */"; --- 18,28 ---- protected final String TEXT_1 = "/*" + NL + " * This file was automatically generated by "; protected final String TEXT_2 = NL + " * <http://ccmtools.sourceforge.net>" + NL + " * DO NOT EDIT!" + NL + " */" + NL + "" + NL + "package "; ! protected final String TEXT_3 = ";" + NL; protected final String TEXT_4 = NL; protected final String TEXT_5 = " " + NL + " " + NL + "public class "; protected final String TEXT_6 = "Adapter " + NL + " implements "; ! protected final String TEXT_7 = NL + "{" + NL + " private java.util.logging.Logger logger = ccmtools.local.ServiceLocator.instance().getLogger();" + NL + " " + NL + " private "; protected final String TEXT_8 = " localInterface;" + NL + " private "; ! protected final String TEXT_9 = "_Context ctx;" + NL + " private Components.Assembly assembly;" + NL + "" + NL + " /** Facet adapter references */"; protected final String TEXT_10 = NL; protected final String TEXT_11 = " " + NL + "\t" + NL + " /** Receptacle references */"; *************** *** 33,37 **** protected final String TEXT_16 = " localInterface)" + NL + " {" + NL + " this(localInterface, null);" + NL + " }" + NL + "\t" + NL + " public "; protected final String TEXT_17 = "Adapter("; ! protected final String TEXT_18 = " localInterface, Assembly assembly)" + NL + " {" + NL + " logger.fine(\"localInterface = \" + localInterface + \", \" + assembly);" + NL + " this.localInterface = localInterface;" + NL + " this.assembly = assembly;" + NL + " }" + NL + "\t" + NL + "\t" + NL + " /* " + NL + " * Supported interface methods " + NL + " */" + NL + "" + NL + " /** Supported interface attributes */"; protected final String TEXT_19 = NL; protected final String TEXT_20 = " " + NL + " " + NL + " " + NL + " /** Supported interface methods */"; --- 33,37 ---- protected final String TEXT_16 = " localInterface)" + NL + " {" + NL + " this(localInterface, null);" + NL + " }" + NL + "\t" + NL + " public "; protected final String TEXT_17 = "Adapter("; ! protected final String TEXT_18 = " localInterface, Components.Assembly assembly)" + NL + " {" + NL + " logger.fine(\"localInterface = \" + localInterface + \", \" + assembly);" + NL + " this.localInterface = localInterface;" + NL + " this.assembly = assembly;" + NL + " }" + NL + "\t" + NL + "\t" + NL + " /* " + NL + " * Supported interface methods " + NL + " */" + NL + "" + NL + " /** Supported interface attributes */"; protected final String TEXT_19 = NL; protected final String TEXT_20 = " " + NL + " " + NL + " " + NL + " /** Supported interface methods */"; *************** *** 43,56 **** protected final String TEXT_26 = " " + NL + " " + NL + " /** Receptacle equivalent methods */"; protected final String TEXT_27 = NL; ! protected final String TEXT_28 = NL + "\t" + NL + " /** CCMObject interface methods */" + NL + "\t" + NL + " public void configuration_complete()" + NL + " throws InvalidConfiguration" + NL + " {" + NL + " logger.fine(\"\");" + NL + " ctx = new "; ! protected final String TEXT_29 = "_ContextImpl(this); " + NL + " try" + NL + " {" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.configuration_complete(); " + NL + " }" + NL + " localInterface.set_session_context(ctx);" + NL + " localInterface.ccm_activate();" + NL + " }" + NL + " catch(CCMException e)" + NL + " {" + NL + " throw new InvalidConfiguration();" + NL + " }" + NL + " }" + NL + "" + NL + " public void remove()" + NL + " throws RemoveFailure" + NL + " { " + NL + " logger.fine(\"\");" + NL + " try " + NL + " {" + NL + " localInterface.ccm_remove();" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.tear_down(); " + NL + " assembly = null;" + NL + " }" + NL + " }" + NL + " catch(CCMException e)" + NL + " {" + NL + " throw new RemoveFailure();" + NL + " }" + NL + " }" + NL + " " + NL + " public CCMHome get_ccm_home()" + NL + " {" + NL + " throw new RuntimeException(\"Not implemented!\");" + NL + " }" + NL + " " + NL + " " + NL + " /** Navigation interface methods */" + NL + " " + NL + " public Object provide_facet(String name)" + NL + " throws InvalidName" + NL + " {" + NL + " logger.fine(\"name = \" + name);" + NL + " if(name == null)" + NL + " {" + NL + " throw new InvalidName();" + NL + " }"; protected final String TEXT_30 = NL; ! protected final String TEXT_31 = " " + NL + " throw new InvalidName();" + NL + " }" + NL + " " + NL + " " + NL + " /** Receptacle methods */" + NL + " " + NL + " public Cookie connect(String name, Object obj)" + NL + " throws InvalidName, InvalidConnection, " + NL + " AlreadyConnected, ExceededConnectionLimit" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", obj = \" + obj);" + NL + " if(name == null)" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " if(obj == null)" + NL + " {" + NL + " throw new InvalidConnection();" + NL + " } "; protected final String TEXT_32 = " "; protected final String TEXT_33 = NL; ! protected final String TEXT_34 = " " + NL + " else" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " }" + NL + " " + NL + " public void disconnect(String name, Cookie ck)" + NL + " throws InvalidName, InvalidConnection, " + NL + " CookieRequired, NoConnection" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", ck = \" + ck );" + NL + " if(name == null)" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " if(ck == null)" + NL + " {" + NL + " throw new CookieRequired();" + NL + " } "; protected final String TEXT_35 = " "; protected final String TEXT_36 = NL; ! protected final String TEXT_37 = " " + NL + " else" + NL + " {" + NL + " throw new InvalidName();" + NL + " }" + NL + " } " + NL + "}"; protected final String TEXT_38 = NL; --- 43,56 ---- protected final String TEXT_26 = " " + NL + " " + NL + " /** Receptacle equivalent methods */"; protected final String TEXT_27 = NL; ! protected final String TEXT_28 = NL + "\t" + NL + " /** CCMObject interface methods */" + NL + "\t" + NL + " public void configuration_complete()" + NL + " throws Components.InvalidConfiguration" + NL + " {" + NL + " logger.fine(\"\");" + NL + " ctx = new "; ! protected final String TEXT_29 = "_ContextImpl(this); " + NL + " try" + NL + " {" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.configuration_complete(); " + NL + " }" + NL + " localInterface.set_session_context(ctx);" + NL + " localInterface.ccm_activate();" + NL + " }" + NL + " catch(Components.CCMException e)" + NL + " {" + NL + " throw new Components.InvalidConfiguration();" + NL + " }" + NL + " }" + NL + "" + NL + " public void remove()" + NL + " throws Components.RemoveFailure" + NL + " { " + NL + " logger.fine(\"\");" + NL + " try " + NL + " {" + NL + " localInterface.ccm_remove();" + NL + " if(assembly != null) " + NL + " { " + NL + " assembly.tear_down(); " + NL + " assembly = null;" + NL + " }" + NL + " }" + NL + " catch(Components.CCMException e)" + NL + " {" + NL + " throw new Components.RemoveFailure();" + NL + " }" + NL + " }" + NL + " " + NL + " public Components.CCMHome get_ccm_home()" + NL + " {" + NL + " throw new RuntimeException(\"Not implemented!\");" + NL + " }" + NL + " " + NL + " " + NL + " /** Navigation interface methods */" + NL + " " + NL + " public Object provide_facet(String name)" + NL + " throws Components.InvalidName" + NL + " {" + NL + " logger.fine(\"name = \" + name);" + NL + " if(name == null)" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }"; protected final String TEXT_30 = NL; ! protected final String TEXT_31 = " " + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " " + NL + " " + NL + " /** Receptacle methods */" + NL + " " + NL + " public Components.Cookie connect(String name, Object obj)" + NL + " throws Components.InvalidName, Components.InvalidConnection, " + NL + " Components.AlreadyConnected, Components.ExceededConnectionLimit" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", obj = \" + obj);" + NL + " if(name == null)" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " if(obj == null)" + NL + " {" + NL + " throw new Components.InvalidConnection();" + NL + " } "; protected final String TEXT_32 = " "; protected final String TEXT_33 = NL; ! protected final String TEXT_34 = " " + NL + " else" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " }" + NL + " " + NL + " public void disconnect(String name, Components.Cookie ck)" + NL + " throws Components.InvalidName, Components.InvalidConnection, " + NL + " Components.CookieRequired, Components.NoConnection" + NL + " {" + NL + " logger.fine(\"name = \" + name + \", ck = \" + ck );" + NL + " if(name == null)" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " if(ck == null)" + NL + " {" + NL + " throw new Components.CookieRequired();" + NL + " } "; protected final String TEXT_35 = " "; protected final String TEXT_36 = NL; ! protected final String TEXT_37 = " " + NL + " else" + NL + " {" + NL + " throw new Components.InvalidName();" + NL + " }" + NL + " } " + NL + "}"; protected final String TEXT_38 = NL; |