Index: trunk/t3d/.classpath =================================================================== --- trunk/t3d/.classpath (revision 7) +++ trunk/t3d/.classpath (revision 7) @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/t3d/.project =================================================================== --- trunk/t3d/.project (revision 7) +++ trunk/t3d/.project (revision 7) @@ -0,0 +1,17 @@ + + + t3d + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Index: trunk/t3d/build.xml =================================================================== --- trunk/t3d/build.xml (revision 7) +++ trunk/t3d/build.xml (revision 7) @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building T3D Distribution in ${dist}... + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/t3d/css/doc.css =================================================================== --- trunk/t3d/css/doc.css (revision 7) +++ trunk/t3d/css/doc.css (revision 7) @@ -0,0 +1,374 @@ +/* +Navigation bar: + div_views: contains list of all views and possible toggling options + div_modules: contains list of TTCN3 modules + div_index: contains list of TTCN3 elements + +p_header: contains path navigation + +div_content: contains page content + div_element: contains source code of element in Main View + div_comment: contains information from T3D comments + div_statistics: contains statistics in index.html + div_import: contains import table in Import View + div_mp: contains tables in ModuleParameter/Testcase View +*/ +@media screen{ +body{ + background:#FFFFFF; + font-family: Arial, Helvetica; + color:#000000; + margin:0; + border:0; + padding:0; + height:100%; + max-height:100%; + overflow: auto; +} + +#div_modules, #div_index, #div_content{ + overflow:auto; +} + +#div_views, #div_index, #div_modules{ + background-color:#F3F3E7 !important; + padding-left:10px; + font-size:12px; +} + +#div_element, #div_comment, #div_import, #div_mp, #div_statistics{ + font-size:12px; +} + +#div_content{ + border:1px solid #000000; + background-color:#FFFFFF; + position:fixed; + top:60px; + left:25%; + right:1%; + bottom:40px; + overflow:auto; + padding:2px; +} + + +#div_import, #div_mp, #div_statistics, #div_comment, #div_element, #div_statistics{ + border-top:1px solid #000000; + border-bottom:1px solid #000000; +} + +#div_import, #div_mp, #div_statistics{ + background-color:#F3F3E7 !important; +} + +#div_views{ + border:1px solid #000000; + position:fixed; + top:10px; + left:1%; + bottom:40px; + width:22%; + overflow:auto; + +} + +#div_modules{ + border:1px solid #000000; + position:fixed; + top:100px; + left:1%; + bottom:60%; + width:22%; + overflow:auto; +} + +#div_index{ + border:1px solid #000000; + position:fixed; + top:40%; + left:1%; + bottom:40px; + width:22%; + overflow:auto; +} + +#div_comment, #div_element, #div_statistics{ + background-color:#F3F3E7; + padding:15px; + padding-top:0px; + padding-bottom:0px; + margin-bottom:20px; +} + +#p_header a { + color:#AAA; +} + +#p_header a:hover { + color:#FFF; +} + +#p_t3dversion{ + right:1%; + position:absolute; + bottom:1px; + text-align:right; + font-size:10px; +} + +#path{ + font-size:10px; +} + +#p_header{ + border:1px solid #000000; + font-size:15px; + position:absolute; + top:10px; + left:25%; + right:1%; + height:30px; + overflow:hidden; + margin:0px; + padding:10px; + background:#53829d; + color:#FFFFFF; +} +} +/* Not YET Used */ +#header { + position:absolute; + top:0; + left:0; + width:100%; + height:120px; + overflow:auto; + background:#53829d; + color:#fff; + } + +/* Not YET Used */ +#footer { + position:absolute; + bottom:0; + left:0; + width:100%; + height:50px; + overflow:auto; + text-align:right; + background:#73a2bd; +} + +.td_commenttype{ + vertical-align:top; +} + +table +{ + border-collapse:collapse; +} + +table, td, th +{ + border:1px solid black; +} + +#table_statistics{ + margin-top:20px; + margin-left: auto; + margin-right: auto; +} + +.import_grey a{ + color:#777777 !important; +} + +.td_table_statistics_left{ + text-align:right; + padding-right:5px; +} + +.td_table_statistics_mid{ + text-align:center; + padding-right:5px; +} + +.td_table_statistics_right{ + text-align:left; + padding-left:5px; +} + +#div_statistics th{ + width:30%; + border-bottom:none !important; +} + +#div_statistics td{ + text-align:center; +} + +.td_table_statistics_modules{ + text-align:left !important; +} + +#div_element{ + font-family:monospace; +} + +a:link, a:active, a:hover, a:visited{ + color:#333377; + text-decoration:none; +} + +#div_element a{ + color:blue; +} + +#div_element a:hover{ + color:red; + text-decoration:underline; +} + +#table_import td{ + vertical-align:top; + width:33%; + padding-left:10px; +} + +#table_import{ + width:100%; +} + + + + +#table_import_modules{ + border-left:1px solid #000000; + border-right:1px solid #000000; +} + +.div_group_behaviour{ + padding-left:50px; +} + +.comment_line{ + padding-right:50px; +} + +.span_tagtype, .span_tagtypeOrig{ + font-weight:bold; +} + +.bold{ + font-weight:bold; +} + +#head_name{ + color:#0000FF; + font-weight:bold; +} + +.comment{ + background-color:#DDDDDD; + padding:5px; +} + +.elementName{ + background-color:#BBBBFF; + padding-left:5px; +} +/* +importedby, importedby_ind, selected, imports, imports: determine colors of modules in Import View +*/ +.importedby{ + color:#f86503 !important; +} + +.importedby_ind{ + color:#FF0000 !important; +} + +.selected{ + color:#000000 !important; +} + +.imports{ + color:#278e57 !important; +} + +.imports_ind{ + color:#00FF00 !important; +} + + +/* spans (toggle) notes */ +.span_showhidenote{ + font-size: 5pt; + bottom: 0.5em; +} + +.padding_left_10px{ + padding-left:10px; + border:none !important; +} + +.padding_left_10px tr td{ + border:none !important; +} + + +.padding_left_20px{ + padding-left:20px; +} +/* contains source code */ +pre { + white-space: pre-wrap; +} +/*spans highlighted TTCN3 keywords*/ +.syntax{ + font-weight:bold !important; +} + +@media print{ + +body{ + background:#FFFFFF; + font-family: Arial, Helvetica; + color:#000000; + margin:0; + border:0; + padding:0; + height:100%; + max-height:100%; +} + +div{ + margin-left:6px !important; +} +#div_views, #div_index, #div_modules { + display:none !important; +} + +#div_comment{ + border-bottom:1px solid #000000; +} + +p, pre, span, a, div{ + color:#000000 !important;background-color:#FFFFFF !important;font-size:12px !important; +} +#div_content, #p_header{ + left:0px !important; width:615px !important; border:none !important; height:auto !important; +} + +#div_element pre{ + border:0.5px dotted black !important; +} + + +#p_t3dversion{ + text-align:right; + font-size:10px; +} + +} Index: trunk/t3d/js/doc.js =================================================================== --- trunk/t3d/js/doc.js (revision 7) +++ trunk/t3d/js/doc.js (revision 7) @@ -0,0 +1,127 @@ +var toggled = false; + +var toggled1 = false; +var toggled2 = false; + +function getElementsByClass(searchClass,node,tag) { + var classElements = new Array(); + if ( node == null ) + node = document; + if ( tag == null ) + tag = '*'; + var els = node.getElementsByTagName(tag); + var elsLen = els.length; + var pattern = new RegExp('(^|\\\\s)'+searchClass+'(\\\\s|$)'); + for (i = 0, j = 0; i < elsLen; i++) { + if ( pattern.test(els[i].className) ) { + classElements[j] = els[i]; + j++; + } + } + return classElements; +} + +function toggleConstructbodies(hide){ + if(hide == "true"){ + var x; + var constructBodies = getElementsByClass("span_constructbody"); + + if(toggled) + for(x in constructBodies) + constructBodies[x].style.display=''; + else + for(x in constructBodies) + constructBodies[x].style.display='none'; + toggled = !toggled; + } + if (document.getElementById('modulebody') != null){ + document.getElementById('modulebody').style.display=''; + } +} + +function toggleImportDetails(){ + var x; + var constructBodies = getElementsByClass("span_importdetail"); + + if(toggled) + for(x in constructBodies) + constructBodies[x].style.display=''; + else + for(x in constructBodies) + constructBodies[x].style.display='none'; + toggled = !toggled; +} + +function togglePaths(hide){ + if(hide == "true"){ + var x; + var constructBodies = getElementsByClass("td_path"); + + if(toggled) + for(x in constructBodies) + constructBodies[x].style.display=''; + else + for(x in constructBodies) + constructBodies[x].style.display='none'; + toggled = !toggled; + } +} + +function toggleHideNotes(){ + var x; + var constructBodies = getElementsByClass("span_showhidenote"); + for(x in constructBodies){ + toggleElement(constructBodies[x]); + } +} + +function toggleElement(element){ + if(element.style.display=='none') + element.style.display=''; + else + element.style.display='none'; +} + +function toggle(elementName){ + var element = document.getElementById(elementName); + toggleElement(element); +} + +function mp_init(listName){ + if(listName != 'Group') +// if (document.getElementById('span_groups')!=null) + document.getElementById('span_groups').style.display='none'; + if(listName != 'Testcase') +// if (document.getElementById('span_testcases'!=null)) + document.getElementById('span_testcases').style.display='none'; + if(listName != 'Module Parameter') +// if (document.getElementById('span_parameters')!=null) + document.getElementById('span_module parameters').style.display='none'; +} + +function init(listName){ + toggleHideNotes(); + if(listName != 'Group') + document.getElementById('span_groups').style.display='none'; + if(listName != 'Function') + document.getElementById('span_functions').style.display='none'; + if(listName != 'Type') + document.getElementById('span_types').style.display='none'; + if(listName != 'Signature') + document.getElementById('span_signatures').style.display='none'; + if(listName != 'Testcase') + document.getElementById('span_testcases').style.display='none'; + if(listName != 'Altstep') + document.getElementById('span_altsteps').style.display='none'; + if(listName != 'Template') + document.getElementById('span_templates').style.display='none'; + if(listName != 'Constant') + document.getElementById('span_constants').style.display='none'; + if(listName != 'Module Parameter') + document.getElementById('span_module parameters').style.display='none'; + if(listName != 'External Function') + document.getElementById('span_external functions').style.display='none'; + if(listName != 'External Constant') + document.getElementById('span_external constants').style.display='none'; + +} Index: trunk/t3d/lib/LICENSE.txt =================================================================== --- trunk/t3d/lib/LICENSE.txt (revision 7) +++ trunk/t3d/lib/LICENSE.txt (revision 7) @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + Index: trunk/t3d/lib/xpp3-license.txt =================================================================== --- trunk/t3d/lib/xpp3-license.txt (revision 7) +++ trunk/t3d/lib/xpp3-license.txt (revision 7) @@ -0,0 +1,46 @@ +Indiana University Extreme! Lab Software License + +Version 1.1.1 + +Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + +3. The end-user documentation included with the redistribution, if any, + must include the following acknowledgment: + + "This product includes software developed by the Indiana University + Extreme! Lab (http://www.extreme.indiana.edu/)." + +Alternately, this acknowledgment may appear in the software itself, +if and wherever such third-party acknowledgments normally appear. + +4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" +must not be used to endorse or promote products derived from this +software without prior written permission. For written permission, +please contact http://www.extreme.indiana.edu/. + +5. Products derived from this software may not use "Indiana Univeristy" +name nor may "Indiana Univeristy" appear in their name, without prior +written permission of the Indiana University. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Index: trunk/t3d/lib/xstream-license.txt =================================================================== --- trunk/t3d/lib/xstream-license.txt (revision 7) +++ trunk/t3d/lib/xstream-license.txt (revision 7) @@ -0,0 +1,28 @@ +(BSD Style License) + +Copyright (c) 2003-2006, Joe Walnes +Copyright (c) 2006-2007, XStream Committers +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of XStream nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. Index: trunk/t3d/nsis/EnvVarUpdate.nsh =================================================================== --- trunk/t3d/nsis/EnvVarUpdate.nsh (revision 7) +++ trunk/t3d/nsis/EnvVarUpdate.nsh (revision 7) @@ -0,0 +1,327 @@ +/** + * EnvVarUpdate.nsh + * : Environmental Variables: append, prepend, and remove entries + * + * WARNING: If you use StrFunc.nsh header then include it before this file + * with all required definitions. This is to avoid conflicts + * + * Usage: + * ${EnvVarUpdate} "ResultVar" "EnvVarName" "Action" "RegLoc" "PathString" + * + * Credits: + * Version 1.0 + * * Cal Turney (turnec2) + * * Amir Szekely (KiCHiK) and e-circ for developing the forerunners of this + * function: AddToPath, un.RemoveFromPath, AddToEnvVar, un.RemoveFromEnvVar, + * WriteEnvStr, and un.DeleteEnvStr + * * Diego Pedroso (deguix) for StrTok + * * Kevin English (kenglish_hi) for StrContains + * * Hendri Adriaens (Smile2Me), Diego Pedroso (deguix), and Dan Fuhry + * (dandaman32) for StrReplace + * + * Version 1.1 (compatibility with StrFunc.nsh) + * * techtonik + * + * http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries + * + */ + + +!ifndef ENVVARUPDATE_FUNCTION +!define ENVVARUPDATE_FUNCTION +!verbose push +!verbose 3 +!include "LogicLib.nsh" +!include "WinMessages.NSH" +!include "StrFunc.nsh" + +; ---- Fix for conflict if StrFunc.nsh is already includes in main file ----------------------- +!macro _IncludeStrFunction StrFuncName + !ifndef ${StrFuncName}_INCLUDED + ${${StrFuncName}} + !endif + !ifndef Un${StrFuncName}_INCLUDED + ${Un${StrFuncName}} + !endif + !define un.${StrFuncName} "${Un${StrFuncName}}" +!macroend + +!insertmacro _IncludeStrFunction StrTok +!insertmacro _IncludeStrFunction StrStr +!insertmacro _IncludeStrFunction StrRep + +; ---------------------------------- Macro Definitions ---------------------------------------- +!macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString + Push "${EnvVarName}" + Push "${Action}" + Push "${RegLoc}" + Push "${PathString}" + Call EnvVarUpdate + Pop "${ResultVar}" +!macroend +!define EnvVarUpdate '!insertmacro "_EnvVarUpdateConstructor"' + +!macro _unEnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString + Push "${EnvVarName}" + Push "${Action}" + Push "${RegLoc}" + Push "${PathString}" + Call un.EnvVarUpdate + Pop "${ResultVar}" +!macroend +!define un.EnvVarUpdate '!insertmacro "_unEnvVarUpdateConstructor"' +; ---------------------------------- Macro Definitions end------------------------------------- + +;----------------------------------- EnvVarUpdate start---------------------------------------- +!define hklm_all_users 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' +!define hkcu_current_user 'HKCU "Environment"' + +!macro EnvVarUpdate UN + +Function ${UN}EnvVarUpdate + + Push $0 + Exch 4 + Exch $1 + Exch 3 + Exch $2 + Exch 2 + Exch $3 + Exch + Exch $4 + Push $5 + Push $6 + Push $7 + Push $8 + Push $9 + Push $R0 + + /* After this point: + ------------------------- + $0 = ResultVar (returned) + $1 = EnvVarName (input) + $2 = Action (input) + $3 = RegLoc (input) + $4 = PathString (input) + $5 = Orig EnvVar (read from registry) + $6 = Len of $0 (temp) + $7 = tempstr1 (temp) + $8 = Entry counter (temp) + $9 = tempstr2 (temp) + $R0 = tempChar (temp) */ + + ; Step 1: Read contents of EnvVarName from RegLoc + ; + ; Check for empty EnvVarName + ${If} $1 == "" + SetErrors + DetailPrint "ERROR: EnvVarName is blank" + Goto EnvVarUpdate_Restore_Vars + ${EndIf} + + ; Check for valid Action + ${If} $2 != "A" + ${AndIf} $2 != "P" + ${AndIf} $2 != "R" + SetErrors + DetailPrint "ERROR: Invalid Action - must be A, P, or R" + Goto EnvVarUpdate_Restore_Vars + ${EndIf} + + ${If} $3 == HKLM + ReadRegStr $5 ${hklm_all_users} $1 ; Get EnvVarName from all users into $5 + ${ElseIf} $3 == HKCU + ReadRegStr $5 ${hkcu_current_user} $1 ; Read EnvVarName from current user into $5 + ${Else} + SetErrors + DetailPrint 'ERROR: Action is [$3] but must be "HKLM" or HKCU"' + Goto EnvVarUpdate_Restore_Vars + ${EndIf} + + ; Check for empty PathString + ${If} $4 == "" + SetErrors + DetailPrint "ERROR: PathString is blank" + Goto EnvVarUpdate_Restore_Vars + ${EndIf} + + ; Make sure we've got some work to do + ${If} $5 == "" + ${AndIf} $2 == "R" + SetErrors + DetailPrint "$1 is empty - Nothing to remove" + Goto EnvVarUpdate_Restore_Vars + ${EndIf} + + ; Step 2: Scrub EnvVar + ; + StrCpy $0 $5 ; Copy the contents to $0 + ; Remove spaces around semicolons (NOTE: spaces before the 1st entry or + ; after the last one are not removed here but instead in Step 3) + ${If} $0 != "" ; If EnvVar is not empty ... + ${Do} + ${${UN}StrStr} $7 $0 " ;" + ${If} $7 == "" + ${ExitDo} + ${EndIf} + ${${UN}StrRep} $0 $0 " ;" ";" ; Remove ';' + ${Loop} + ${Do} + ${${UN}StrStr} $7 $0 "; " + ${If} $7 == "" + ${ExitDo} + ${EndIf} + ${${UN}StrRep} $0 $0 "; " ";" ; Remove ';' + ${Loop} + ${Do} + ${${UN}StrStr} $7 $0 ";;" + ${If} $7 == "" + ${ExitDo} + ${EndIf} + ${${UN}StrRep} $0 $0 ";;" ";" + ${Loop} + + ; Remove a leading or trailing semicolon from EnvVar + StrCpy $7 $0 1 0 + ${If} $7 == ";" + StrCpy $0 $0 "" 1 ; Change ';' to '' + ${EndIf} + StrLen $6 $0 + IntOp $6 $6 - 1 + StrCpy $7 $0 1 $6 + ${If} $7 == ";" + StrCpy $0 $0 $6 ; Change ';' to '' + ${EndIf} + ; DetailPrint "Scrubbed $1: [$0]" ; Uncomment to debug + ${EndIf} + + /* Step 3. Remove all instances of the target path/string (even if "A" or "P") + $6 = bool flag (1 = found and removed PathString) + $7 = a string (e.g. path) delimited by semicolon(s) + $8 = entry counter starting at 0 + $9 = copy of $0 + $R0 = tempChar */ + + ${If} $5 != "" ; If EnvVar is not empty ... + StrCpy $9 $0 + StrCpy $0 "" + StrCpy $8 0 + StrCpy $6 0 + + ${Do} + ${${UN}StrTok} $7 $9 ";" $8 "0" ; $7 = next entry, $8 = entry counter + + ${If} $7 == "" ; If we've run out of entries, + ${ExitDo} ; were done + ${EndIf} ; + + ; Remove leading and trailing spaces from this entry (critical step for Action=Remove) + ${Do} + StrCpy $R0 $7 1 + ${If} $R0 != " " + ${ExitDo} + ${EndIf} + StrCpy $7 $7 "" 1 ; Remove leading space + ${Loop} + ${Do} + StrCpy $R0 $7 1 -1 + ${If} $R0 != " " + ${ExitDo} + ${EndIf} + StrCpy $7 $7 -1 ; Remove trailing space + ${Loop} + ${If} $7 == $4 ; If string matches, remove it by not appending it + StrCpy $6 1 ; Set 'found' flag + ${ElseIf} $7 != $4 ; If string does NOT match + ${AndIf} $0 == "" ; and the 1st string being added to $0, + StrCpy $0 $7 ; copy it to $0 without a prepended semicolon + ${ElseIf} $7 != $4 ; If string does NOT match + ${AndIf} $0 != "" ; and this is NOT the 1st string to be added to $0, + StrCpy $0 $0;$7 ; append path to $0 with a prepended semicolon + ${EndIf} ; + + IntOp $8 $8 + 1 ; Bump counter + ${Loop} ; Check for duplicates until we run out of paths + ${EndIf} + + ; Step 4: Perform the requested Action + ; + ${If} $2 != "R" ; If Append or Prepend + ${If} $6 == 1 ; And if we found the target + DetailPrint "Target is already present in $1. It will be removed and" + ${EndIf} + ${If} $0 == "" ; If EnvVar is (now) empty + StrCpy $0 $4 ; just copy PathString to EnvVar + ${If} $6 == 0 ; If found flag is either 0 + ${OrIf} $6 == "" ; or blank (if EnvVarName is empty) + DetailPrint "$1 was empty and has been updated with the target" + ${EndIf} + ${ElseIf} $2 == "A" ; If Append (and EnvVar is not empty), + StrCpy $0 $0;$4 ; append PathString + ${If} $6 == 1 + DetailPrint "appended to $1" + ${Else} + DetailPrint "Target was appended to $1" + ${EndIf} + ${Else} ; If Prepend (and EnvVar is not empty), + StrCpy $0 $4;$0 ; prepend PathString + ${If} $6 == 1 + DetailPrint "prepended to $1" + ${Else} + DetailPrint "Target was prepended to $1" + ${EndIf} + ${EndIf} + ${Else} ; If Action = Remove + ${If} $6 == 1 ; and we found the target + DetailPrint "Target was found and removed from $1" + ${Else} + DetailPrint "Target was NOT found in $1 (nothing to remove)" + ${EndIf} + ${If} $0 == "" + DetailPrint "$1 is now empty" + ${EndIf} + ${EndIf} + + ; Step 5: Update the registry at RegLoc with the updated EnvVar and announce the change + ; + ClearErrors + ${If} $3 == HKLM + WriteRegExpandStr ${hklm_all_users} $1 $0 ; Write it in all users section + ${ElseIf} $3 == HKCU + WriteRegExpandStr ${hkcu_current_user} $1 $0 ; Write it to current user section + ${EndIf} + + IfErrors 0 +4 + MessageBox MB_OK|MB_ICONEXCLAMATION "Could not write updated $1 to $3" + DetailPrint "Could not write updated $1 to $3" + Goto EnvVarUpdate_Restore_Vars + + ; "Export" our change + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 + + EnvVarUpdate_Restore_Vars: + ; + ; Restore the user's variables and return ResultVar + Pop $R0 + Pop $9 + Pop $8 + Pop $7 + Pop $6 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Push $0 ; Push my $0 (ResultVar) + Exch + Pop $0 ; Restore his $0 + +FunctionEnd + +!macroend ; EnvVarUpdate UN +!insertmacro EnvVarUpdate "" +!insertmacro EnvVarUpdate "un." +;----------------------------------- EnvVarUpdate end---------------------------------------- + +!verbose pop +!endif Index: trunk/t3d/nsis/WriteEnvStr.nsh =================================================================== --- trunk/t3d/nsis/WriteEnvStr.nsh (revision 7) +++ trunk/t3d/nsis/WriteEnvStr.nsh (revision 7) @@ -0,0 +1,148 @@ +!ifndef _WriteEnvStr_nsh +!define _WriteEnvStr_nsh + +!include WinMessages.nsh + +!ifndef WriteEnvStr_RegKey + !ifdef ALL_USERS + !define WriteEnvStr_RegKey \ + 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' + !else + !define WriteEnvStr_RegKey 'HKCU "Environment"' + !endif +!endif + +# +# WriteEnvStr - Writes an environment variable +# Note: Win9x systems requires reboot +# +# Example: +# Push "HOMEDIR" # name +# Push "C:\New Home Dir\" # value +# Call WriteEnvStr +# +Function WriteEnvStr + Exch $1 ; $1 has environment variable value + Exch + Exch $0 ; $0 has environment variable name + Push $2 + + Call IsNT + Pop $2 + StrCmp $2 1 WriteEnvStr_NT + ; Not on NT + StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:) + FileOpen $2 "$2\autoexec.bat" a + FileSeek $2 0 END + FileWrite $2 "$\r$\nSET $0=$1$\r$\n" + FileClose $2 + SetRebootFlag true + Goto WriteEnvStr_done + + WriteEnvStr_NT: + WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ + 0 "STR:Environment" /TIMEOUT=5000 + + WriteEnvStr_done: + Pop $2 + Pop $0 + Pop $1 +FunctionEnd + +# +# un.DeleteEnvStr - Removes an environment variable +# Note: Win9x systems requires reboot +# +# Example: +# Push "HOMEDIR" # name +# Call un.DeleteEnvStr +# +Function un.DeleteEnvStr + Exch $0 ; $0 now has the name of the variable + Push $1 + Push $2 + Push $3 + Push $4 + Push $5 + + Call un.IsNT + Pop $1 + StrCmp $1 1 DeleteEnvStr_NT + ; Not on NT + StrCpy $1 $WINDIR 2 + FileOpen $1 "$1\autoexec.bat" r + GetTempFileName $4 + FileOpen $2 $4 w + StrCpy $0 "SET $0=" + SetRebootFlag true + + DeleteEnvStr_dosLoop: + FileRead $1 $3 + StrLen $5 $0 + StrCpy $5 $3 $5 + StrCmp $5 $0 DeleteEnvStr_dosLoop + StrCmp $5 "" DeleteEnvStr_dosLoopEnd + FileWrite $2 $3 + Goto DeleteEnvStr_dosLoop + + DeleteEnvStr_dosLoopEnd: + FileClose $2 + FileClose $1 + StrCpy $1 $WINDIR 2 + Delete "$1\autoexec.bat" + CopyFiles /SILENT $4 "$1\autoexec.bat" + Delete $4 + Goto DeleteEnvStr_done + + DeleteEnvStr_NT: + DeleteRegValue ${WriteEnvStr_RegKey} $0 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ + 0 "STR:Environment" /TIMEOUT=5000 + + DeleteEnvStr_done: + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 +FunctionEnd + +!ifndef IsNT_KiCHiK +!define IsNT_KiCHiK + +# +# [un.]IsNT - Pushes 1 if running on NT, 0 if not +# +# Example: +# Call IsNT +# Pop $0 +# StrCmp $0 1 +3 +# MessageBox MB_OK "Not running on NT!" +# Goto +2 +# MessageBox MB_OK "Running on NT!" +# +!macro IsNT UN +Function ${UN}IsNT + Push $0 + ReadRegStr $0 HKLM \ + "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion + StrCmp $0 "" 0 IsNT_yes + ; we are not NT. + Pop $0 + Push 0 + Return + + IsNT_yes: + ; NT!!! + Pop $0 + Push 1 +FunctionEnd +!macroend +!insertmacro IsNT "" +!insertmacro IsNT "un." + +!endif ; IsNT_KiCHiK + +!endif ; _WriteEnvStr_nsh Index: trunk/t3d/nsis/t3d.nsi =================================================================== --- trunk/t3d/nsis/t3d.nsi (revision 7) +++ trunk/t3d/nsis/t3d.nsi (revision 7) @@ -0,0 +1,198 @@ +; T3D Installer +;----------------------------------------------------------------------------------------------------------------------------- + +!define PRODUCT_NAME "T3D" +!define AppName "T3D" +!define AppVersion "1.0" +!define ShortName "T3D" +!define Vendor "Software Engineering for Distributed Systems Group, University of G�ttingen" +!define JRE_VERSION "1.6" +!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=26223" +!define ALL_USERS + +LangString ConfirmUninstall ${LANG_ENGLISH} "All existing \ +files and folders under the $(^Name) installation directory \ +'$INSTDIR' will be removed.$\r$\nThis includes any files and folders \ +that have since been added after the installation of \ +$(^Name).$\r$\n$\r$\nAre you sure you wish to continue?" + +!include "MUI2.nsh" +!include "StrFunc.nsh" +!include "EnvVarUpdate.nsh" +!include "WriteEnvStr.nsh" + +Name "T3D" +OutFile "t3d-install-32bit.exe" + +InstallDir $PROGRAMFILES\ETSI\T3D +InstallDirRegKey HKLM "Software\ETSI\T3D" "Install_Dir" + +RequestExecutionLevel admin + +!define MUI_ABORTWARNING + +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +!insertmacro MUI_LANGUAGE "English" + +Section "" + Call DetectJRE +SectionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +; The stuff to install +Section "T3D (required)" + SectionIn RO + SetOutPath $INSTDIR + File "..\dist\t3d.bat" + File "..\doc\t3d-documentation.pdf" + SetOutPath $INSTDIR\css + File "..\css\*.css" + SetOutPath $INSTDIR\js + File "..\js\*.js" + SetOutPath $INSTDIR\xsd + File "..\xsd\*.*" + SetOutPath $INSTDIR\xslt + File "..\xslt\*.xsl" + SetOutPath $INSTDIR\lib + File /r "..\dist\lib\*.jar" + SetOutPath $INSTDIR + + ;CreateDirectory $APPDATA\T3D + + WriteRegStr HKLM SOFTWARE\ETSI\T3D "Install_Dir" "$INSTDIR" + + ${EnvVarUpdate} $0 "T3D_HOME" "A" "HKLM" $INSTDIR + ${EnvVarUpdate} $0 "PATH" "A" "HKLM" $INSTDIR + + ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\1.6" "JavaHome" + StrCmp $2 "" 0 registerJavaHome + ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\1.6" "JavaHome" + StrCmp $2 "" 0 registerJavaHome +registerJavaHome: + Push JAVA_HOME + Push $2 + Call WriteEnvStr + + ; Write the uninstall keys for Windows + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AppName}" "DisplayName" "${AppName}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AppName}" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AppName}" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AppName}" "NoRepair" 1 + WriteUninstaller "uninstall.exe" +SectionEnd + +Section "T3D Sample Files" + SetOutPath $INSTDIR\samples + + File /r /x ".svn" /x ".project" "..\..\t3d-examples\*.*" +SectionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +; Start Menu Section +Section "Start Menu Shortcuts" + CreateDirectory "$SMPROGRAMS\${AppName}" + CreateShortCut "$SMPROGRAMS\${AppName}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 + CreateShortCut "$SMPROGRAMS\${AppName}\T3D Documentation.lnk" "$INSTDIR\t3d-documentation.pdf" + CreateShortCut "$SMPROGRAMS\${AppName}\T3D Default CSS File.lnk" "$INSTDIR\css\doc.css" + + SetOutPath $INSTDIR\samples + CreateShortCut "$SMPROGRAMS\${AppName}\Samples Folder.lnk" "$INSTDIR\samples" +; CreateShortCut "$SMPROGRAMS\${AppName}\T3D Configuration Directory.lnk" "$APPDATA\T3D\" + CreateShortCut "$SMPROGRAMS\${AppName}\Samples Folder (Command-Line).lnk" "$WINDIR\system32\cmd.exe" +SectionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +; Uninstaller +Section "Uninstall" + ; Remove registry keys + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AppName}" + DeleteRegKey HKLM SOFTWARE\ETSI\${AppName} + + MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(ConfirmUninstall) IDOK +2 + Abort + RMDir /r $INSTDIR + + ; Remove shortcuts, if any + Delete "$SMPROGRAMS\${AppName}\*.*" + + ; Remove directories used + RMDir "$SMPROGRAMS\${AppName}" + RMDir "$INSTDIR" + RMDir "$PROGRAMFILES\ETSI" + + ; Remove Environment Variables + ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" $INSTDIR + Push T3D_HOME + Call un.DeleteEnvStr + Push T3D_HOME + Call un.DeleteEnvStr +SectionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +Function GetJRE + MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION}, it will now \ + be downloaded and installed" + + StrCpy $2 "$TEMP\Java Runtime Environment.exe" + nsisdl::download /TIMEOUT=30000 ${JRE_URL} $2 + Pop $R0 ;Get the return value + StrCmp $R0 "success" +3 + MessageBox MB_OK "Download failed: $R0" + Quit + ExecWait $2 + Delete $2 +FunctionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +Function DetectJRE + ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \ + "CurrentVersion" + StrCmp $2 ${JRE_VERSION} done + + Call GetJRE + + done: +FunctionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +Function .onInstSuccess + MessageBox MB_OK "You have successfully installed ${PRODUCT_NAME}. You can now use 't3d' on the command-line!" +FunctionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +;Function un.onUninstSuccess +; MessageBox MB_OK "You have successfully uninstalled ${PRODUCT_NAME}." +;FunctionEnd + +;----------------------------------------------------------------------------------------------------------------------------- +Function .onInit + ReadRegStr $R0 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AppName}" \ + "UninstallString" + StrCmp $R0 "" done + + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ + "${AppName} is already installed. $\n$\nClick `OK` to remove the \ + previous version or `Cancel` to cancel this upgrade." \ + IDOK uninst + Abort + +;Run the uninstaller +uninst: + ClearErrors + ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + + IfErrors no_remove_uninstaller + ;You can either use Delete /REBOOTOK in the uninstaller or add some code + ;here to remove the uninstaller. Use a registry key to check + ;whether the user has chosen to uninstall. If you are using an uninstaller + ;components page, make sure all sections are uninstalled. + no_remove_uninstaller: + +done: +FunctionEnd Index: trunk/t3d/src/elements/TTCN3Comment.java =================================================================== --- trunk/t3d/src/elements/TTCN3Comment.java (revision 7) +++ trunk/t3d/src/elements/TTCN3Comment.java (revision 7) @@ -0,0 +1,309 @@ +package elements; + +import java.util.LinkedList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.commons.lang.*; +import org.etsi.t3d.T3D; + +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3ParserTokenTypes; + +public class TTCN3Comment { + private String commentsXML; + + + + private LinkedList desc = new LinkedList(); + private LinkedList author = new LinkedList(); + private LinkedList config = new LinkedList(); + private LinkedList exception = new LinkedList(); + private LinkedList member = new LinkedList(); + private LinkedList param = new LinkedList(); + private LinkedList purpose = new LinkedList(); + private LinkedList remark = new LinkedList(); + private LinkedList Return = new LinkedList(); + private LinkedList see = new LinkedList(); + private LinkedList since = new LinkedList(); + private LinkedList status = new LinkedList(); + private LinkedList url = new LinkedList(); + private LinkedList verdict = new LinkedList(); + private LinkedList version = new LinkedList(); + + private LinkedList warnings = new LinkedList(); + private LinkedList seeRefs = new LinkedList(); + + + public TTCN3Comment(LocationAST node){ + + } + + + + //TODO: WHY WHY WHY OH WHY?!?!?!?!?!??! REORGANIZE AND REFACTOR + public TTCN3Comment(String rawComments, int elementType){ + if(rawComments != null && !rawComments.equals("")){ + rawComments = "\n" + rawComments; + rawComments = rawComments.replaceAll("\\r", ""); + rawComments = rawComments.replaceAll("\\n(\\s|\\*|/)*", "\n").replaceAll("\\n+","\n"); + rawComments = rawComments.trim() + "\r___NEWTAG___"; + rawComments = rawComments.replaceAll(" @see", " @esee").replaceAll(" @url", " @eurl"); + rawComments = rawComments.replaceAll("\\n@", "\r___NEWTAG___@"); + + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getDescTag(), desc); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getAuthorTag(), author); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getConfigTag(), config); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getExceptionTag(), exception); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getMemberTag(), member); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getParamTag(), param); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getPurposeTag(), purpose); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getRemarkTag(), remark); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getReturnTag(), Return); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getSeeTag(), see); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getSinceTag(), since); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getStatusTag(), status); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getUrlTag(), url); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getVerdictTag(), verdict); + getComments(rawComments, T3D.activeProfile.getCommentTagsConfiguration().getVersionTag(), version); + + + if (T3D.activeProfile.isCheckConsistentTagUsage()) { + if (config.size() >= 2) + warnings.add(getWarningMultipleTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getConfigTag())); + if (purpose.size() >= 2) + warnings.add(getWarningMultipleTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getPurposeTag())); + if (Return.size() >= 2) + warnings.add(getWarningMultipleTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getReturnTag())); + if (since.size() >= 2) + warnings.add(getWarningMultipleTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getSinceTag())); + if (status.size() >= 2) + warnings.add(getWarningMultipleTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getStatusTag())); + if (version.size() >= 2) + warnings.add(getWarningMultipleTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getVersionTag())); + + if (elementType != TTCN3ParserTokenTypes.TestcaseDef && config.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getConfigTag())); + } + if (elementType != TTCN3ParserTokenTypes.SignatureDef && exception.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getExceptionTag())); + } + if (elementType != TTCN3ParserTokenTypes.TypeDef + && elementType != TTCN3ParserTokenTypes.TemplateDef + && elementType != TTCN3ParserTokenTypes.ModuleParDef + && elementType != TTCN3ParserTokenTypes.ConstDef + && member.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getMemberTag())); + } + if (elementType != TTCN3ParserTokenTypes.TemplateDef + && elementType != TTCN3ParserTokenTypes.SignatureDef + && elementType != TTCN3ParserTokenTypes.FunctionDef + && elementType != TTCN3ParserTokenTypes.AltstepDef + && elementType != TTCN3ParserTokenTypes.TestcaseDef + && param.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getParamTag())); + } + if (elementType != TTCN3ParserTokenTypes.TestcaseDef && purpose.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getPurposeTag())); + } + if (elementType != TTCN3ParserTokenTypes.FunctionDef && elementType != TTCN3ParserTokenTypes.SignatureDef && Return.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getReturnTag())); + } + if (elementType != TTCN3ParserTokenTypes.FunctionDef + && elementType != TTCN3ParserTokenTypes.TestcaseDef + && elementType != TTCN3ParserTokenTypes.AltstepDef + && verdict.size() >= 1) { + warnings.add(getWarningExtraTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getVerdictTag())); + } + + for (String d : desc) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getDescTag())); + for (String d : author) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getAuthorTag())); + for (String d : config) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getConfigTag())); + for (String d : exception) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getExceptionTag())); + for (String d : member) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getMemberTag())); + for (String d : param) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getParamTag())); + for (String d : purpose) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getPurposeTag())); + for (String d : remark) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getRemarkTag())); + for (String d : Return) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getReturnTag())); + for (String d : see) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getSeeTag())); + for (String d : since) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getSinceTag())); + for (String d : status) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getStatusTag())); + for (String d : url) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getUrlTag())); + for (String d : verdict) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getVerdictTag())); + for (String d : version) + if (d.length() <= 0) + warnings.add(getWarningEmptyTags("@" + T3D.activeProfile.getCommentTagsConfiguration().getVersionTag())); + } + } + + for(String seeRef : see) + seeRefs.add(seeRef); + } + + private String getWarningMultipleTags(String tagname){ + return "Multiple " + tagname + " tags found (may only contain one)"; + } + + private String getWarningExtraTags(String tagname){ + return tagname + " tag found (may not be used here)"; + } + + private String getWarningEmptyTags(String tagname){ + return "Empty tag found: " + tagname; + } + + + private String getIdentifier(String comment, int pos){ + String subString = comment.substring(pos, comment.length()); + + int endpos = subString.indexOf(" "); + if(endpos == -1) + endpos = subString.length(); +// System.out.println("-" + subString.substring(0, endpos) + "-"); + return subString.substring(0, endpos).trim(); + } + + private String replaceTag(String c, String tag){ + int pos; + c += " "; + while(c.contains(" @" + tag + " ")){ + pos = c.indexOf(" @" + tag + " "); + if(pos != -1){ + String identifier = getIdentifier(c, pos+ (tag.length() + 3)); + c = c.replaceAll("@" + tag + " " + identifier + " ", "<" + tag + ">" + identifier + ""); + }else + break; + } + return c.trim(); + } + + private String replaceSee(String c){ + return replaceTag(c, "esee"); + } + + private String replaceUrl(String c){ + return replaceTag(c, "eurl"); + } + + private String formatComment(String c){ + return StringEscapeUtils.escapeXml(c).replaceAll(" ", " ").replaceAll("\n", " ").replaceAll("\t", " ").replaceAll("\r", ""); + + } + + public String toString(){ + commentsXML = ""; + if(!isEmpty()){ + commentsXML += "\n"; + for(String d : desc) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : author) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : config) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : exception) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : member) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : param) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + for(String d : purpose) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : remark) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : Return) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : see) + commentsXML += ("\n" + formatComment(d) + ""); + + for(String d : since) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : status) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : url) + commentsXML += ("\n" + formatComment(d) + ""); + + for(String d : verdict) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + for(String d : version) + commentsXML += ("\n" + replaceUrl(replaceSee(formatComment(d))) + ""); + + commentsXML += ""; + + } + if(commentsXML.length() > 20) + return commentsXML; + else + return ""; + } + + private boolean isEmpty(){ + return false; + } + + private void getComments(String commentblock, String tag, LinkedList vector){ + Pattern p = Pattern.compile("@" + tag + "(.|\\n)*\\r___NEWTAG___"); + Matcher m = p.matcher(commentblock); + while (m.find() == true){ + String comment = m.group().replaceFirst("@"+tag, "").replaceFirst("\r___NEWTAG___", "").trim(); + vector.add(comment); + } + } + + public LinkedList getDocumentedParameters(){ + LinkedList docParNames = new LinkedList(); + for(String parString : param){ + if(parString.indexOf(" ") > 0) + docParNames.add(parString.substring(0, parString.indexOf(" "))); + } + return docParNames; + } + + public LinkedList getDescriptions(){ + LinkedList descriptions = new LinkedList(); + for(String descString : desc) + descriptions.add(descString); + return descriptions; + } + + public LinkedList getWarnings() { + return warnings; + } +} Index: trunk/t3d/src/elements/TTCN3Element.java =================================================================== --- trunk/t3d/src/elements/TTCN3Element.java (revision 7) +++ trunk/t3d/src/elements/TTCN3Element.java (revision 7) @@ -0,0 +1,127 @@ +package elements; + +import java.util.LinkedList; + +import org.etsi.common.logging.LoggingInterface.MessageClass; +import org.etsi.t3d.T3D; + + +public class TTCN3Element{ + + private String type; + private int LEVEL0 = 0; + protected String behaviour; + protected TTCN3Comment comment = null; + protected String name = ""; + protected String location = ""; + protected String paramView = ""; + protected String refs = ""; + protected String path = ""; + private LinkedList descs = new LinkedList(); + + public TTCN3Element() { + + } + + //TODO: using type codes will be presumably preferable + //TODO: HELP!!! THIS IS A DISASTER!!!!! REORGANIZE AND REFACTOR + public TTCN3Element(String name, String type, String location, + String behaviour, TTCN3Comment comment, + LinkedList parNames, String filename, String paramView, String path, int line){ + this.name = name; + this.location = location; + this.behaviour = behaviour; + this.comment = comment; + this.type = type; + this.paramView = paramView; + this.path = path; + + + + for(String warning : comment.getWarnings()) { + +// TODO: revise XML usage +// T3D.printLog(LEVEL0, filename, line, line, 1, warning); + T3D.getLoggingInterface().logWarning(line, line, MessageClass.DOCUMENTATION, warning); + } + + LinkedList descsStrings = comment.getDescriptions(); + for(String descString : descsStrings){ + String[] descArray = {descString, filename, "" + line}; + descs.add(descArray); + } + + + + LinkedList docParNames = comment.getDocumentedParameters(); + + + LinkedList unDocParNames = new LinkedList(); + LinkedList docUnparNames = new LinkedList(); + if(!parNames.isEmpty() && T3D.activeProfile.isCheckUndocumentedParameters()){ + for(String parString : parNames){ + boolean isDocumented = false; + for(String docParString : docParNames){ + if(parString.startsWith(docParString + " ")) + isDocumented = true; + } + if(!isDocumented) + unDocParNames.add(parString); + } + + + for(String docParString : docParNames){ + boolean isParameter = false; + for(String parString : parNames){ + if(parString.startsWith(docParString + " ")) + isParameter = true; + } + if(!isParameter) + docUnparNames.add(docParString); + } + + for(String s : unDocParNames){ + String parName = s.substring(0, s.indexOf(' ')); + Integer parLine = Integer.valueOf(s.substring(s.indexOf(' ')+1)).intValue(); + String warning = "Undocumented parameter found: " + parName ; +// TODO: review XML usage +// T3D.printLog(LEVEL0, filename, parLine, parLine, 1, warning); + T3D.getLoggingInterface().logWarning(parLine, parLine, MessageClass.DOCUMENTATION, warning); + } + + for(String s : docUnparNames){ + String warning = "Documented parameter not found: " + s ; + //TODO: review XML usage +// T3D.printLog(LEVEL0, filename, line, line, 1, warning); + T3D.getLoggingInterface().logWarning(line, line, MessageClass.DOCUMENTATION, warning); + + } + } + } + + public String toXML(String currentModule){ + return "\n" + + "" + name + "\n" + + "" + location + "\n" + + comment.toString() + + "" + behaviour.replaceAll("", " ") + "" + + "" + currentModule + "" + + paramView + + refs + + path + + ""; + } + + public String getType(){ + return type; + } + public LinkedList getDescs() { + return descs; + } + public String getName(){ + return name; + } + public String getLocation(){ + return location; + } +} Index: trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java =================================================================== --- trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java (revision 7) +++ trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java (revision 7) @@ -0,0 +1,78 @@ +package org.etsi.t3d; + +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; + +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST; + +public class DependencyPrinter { + private PrintStream stream; + private String currentTTCN3File; + + public void finishXML(){ + writeStream("\n"); + + } + + public void newElement(String name, String id, int type, int line, + String module, String dependencies) { + writeStream("\n\t"); + writeStream(dependencies); + writeStream("\n\t\n"); + } + + public void newGroup(String name, String id, int type, int line, String module, + String elementList) { + writeStream("\n\t"); + writeStream(elementList); + writeStream("\n\t\n"); + } + + public void setXMLPath(String xmlpath){ + FileOutputStream file; + try { + file = new FileOutputStream(xmlpath); + stream = new PrintStream(file); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + writeStream("\n"); + } + + private void writeStream(String content){ + stream.print(content); + } + + public void setCurrentTTCN3File(String currentTTCN3File) { + this.currentTTCN3File = currentTTCN3File; + } + + public String getCurrentTTCN3File() { + return currentTTCN3File; + } +} Index: trunk/t3d/src/org/etsi/t3d/ImportPrinter.java =================================================================== --- trunk/t3d/src/org/etsi/t3d/ImportPrinter.java (revision 7) +++ trunk/t3d/src/org/etsi/t3d/ImportPrinter.java (revision 7) @@ -0,0 +1,175 @@ +package org.etsi.t3d; + +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.util.LinkedList; + +import org.apache.commons.lang.StringEscapeUtils; +import org.etsi.common.logging.LoggingInterface; +import org.etsi.common.logging.LoggingInterface.MessageClass; +import org.etsi.t3d.visitor.VisitorCommonFunctions; + +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.ASTUtil; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3ParserTokenTypes; + +public class ImportPrinter { + private PrintStream stream; + private boolean firstModule = true; + private LinkedList modules = new LinkedList(); + private LinkedList locationsGlobal = new LinkedList(); + private String currentTTCN3File; + private LoggingInterface logger = null; + + public ImportPrinter() { + this.logger = new LoggingInterface(T3D.activeProfile.getLoggingConfiguration()); + this.logger.setMaximumLogLevel(T3D.getLogLevel()); + } + + public void finishXML(){ + writeStream("\n\n"); + } + + public void setXMLPath(String xmlpath){ + FileOutputStream file; + try { + file = new FileOutputStream(xmlpath); + stream = new PrintStream(file); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + writeStream("\n"); + } + + private void writeStream(String content){ + stream.print(content); + } + + public void setCurrentTTCN3File(String currentTTCN3File) { + this.currentTTCN3File = currentTTCN3File; + } + + public String getCurrentTTCN3File() { + return currentTTCN3File; + } + + public void printImportView(LocationAST node){ + LinkedList ImportDefs = ASTUtil.findTypeNodes(node, TTCN3ParserTokenTypes.ImportDef); + for(LocationAST importDef : ImportDefs){ + LocationAST importModuleIdentifier = importDef; + while(importModuleIdentifier.getFirstChild() != null) + importModuleIdentifier = importModuleIdentifier.getFirstChild(); + LocationAST importedModuleIdentifier = VisitorCommonFunctions.getDeclarationNodeFromIdentifier(importModuleIdentifier); + + if(!locationsGlobal.contains(importModuleIdentifier.getText())){ + listAdd(locationsGlobal,VisitorCommonFunctions.getName(node.getFirstChild())); + + String behaviour = getImportBehavior(importDef); + + writeStream("\n" + + "\n\t\t" + behaviour + "\n\t\t"); + if(!ASTUtil.findTypeNodes(importDef, TTCN3ParserTokenTypes.AllKeyword).isEmpty()){ + listAdd(locationsGlobal, importModuleIdentifier.getText()); + if(importedModuleIdentifier != null) + printImportView(VisitorCommonFunctions.getModule(importedModuleIdentifier)); + } + + writeStream("\n"); + } else{ + String behaviour = getImportBehavior(importDef); + writeStream("\n" + + "\n\t\t" + behaviour + "\n\t\t\n"); + } + } + } + + private String getImportBehavior(LocationAST importDef){ + String b = VisitorCommonFunctions.getWholeElement(importDef, true).replaceAll("\\r", ""); + b = StringEscapeUtils.escapeXml(b); + b = b.replaceAll("\\n", "").trim(); + if(b.indexOf('{') > 0 && b.indexOf('}') > b.indexOf('{')) + b = b.substring(b.indexOf('{') + 1, b.indexOf('}')); + else + b = b.replaceFirst("import from \\w* ", ""); + b = VisitorCommonFunctions.replaceReferences(b, VisitorCommonFunctions.getReferences(importDef)); + return b.trim(); + } + + private void listAdd(LinkedList list, String string){ + if(!list.contains(string)) + list.add(string); + } + + public void checkForCyclicImports(LocationAST node, LinkedList locations){ + LinkedList ImportDefs = ASTUtil.findTypeNodes(node, TTCN3ParserTokenTypes.ImportDef); + for(LocationAST importDef : ImportDefs){ + LocationAST importModuleIdentifier = importDef; + while(importModuleIdentifier.getFirstChild() != null) + importModuleIdentifier = importModuleIdentifier.getFirstChild(); + LocationAST importedModuleIdentifier = VisitorCommonFunctions.getDeclarationNodeFromIdentifier(importModuleIdentifier); + if(!locations.contains(importModuleIdentifier.getText())){ + LinkedList newLocations = new LinkedList(); + for(String l : locations) + newLocations.add(l); + listAdd(newLocations, VisitorCommonFunctions.getName(node.getFirstChild())); + listAdd(newLocations, importModuleIdentifier.getText()); + + + String behaviour = VisitorCommonFunctions.getBehaviour(importDef, 0, false, true); + + behaviour = behaviour.substring(behaviour.indexOf("") + 7).trim(); + if(behaviour.charAt(0) == '{' && behaviour.charAt(behaviour.length()-1) == '}') + behaviour = behaviour.substring(1, behaviour.length()-1); + + behaviour = behaviour.replaceAll("\\s;", "").replaceAll("", "").replaceAll("", "");; + + behaviour = behaviour.trim(); + if(behaviour.charAt(0) == '{') + behaviour = behaviour.replaceAll("\\{", "").replaceAll("\\}", ""); + behaviour = behaviour.replaceAll("\\n", ""); + + if(behaviour.startsWith("all") || behaviour.startsWith("recursive all")) + checkForCyclicImports(VisitorCommonFunctions.getModule(importedModuleIdentifier), newLocations); + } else if(locations.getFirst().equals(importModuleIdentifier.getText())){ + String warning = ""; + for(String l : locations) { + warning += " -> " + l; + } + warning = "Cyclic imports found: " + warning.substring(4) + " -> " + locations.getFirst(); + this.getLoggingInterface().logWarning(importModuleIdentifier.getLine(), + importModuleIdentifier.getLine(), + MessageClass.DOCUMENTATION, + warning); + //TODO: revise XML usage + //T3D.printLog(0, currentTTCN3File, importModuleIdentifier.getLine(), importModuleIdentifier.getLine(), 1, warning); + } + } + } + + public void newModule(String name) { + locationsGlobal = new LinkedList(); + String moduleName = name; + if (modules.contains(name)) { + int repetitionIndex = 0; + while(modules.contains(name + "-"+repetitionIndex)){ + repetitionIndex++; + } + moduleName = name + "-" + repetitionIndex; + } + modules.add(moduleName); + if(!firstModule) + writeStream("\n"); + else + firstModule = false; + writeStream("\n"); + } + + public void setLoggingInterface(LoggingInterface logger) { + this.logger = logger; + } + + public LoggingInterface getLoggingInterface() { + return logger; + } +} Index: trunk/t3d/src/org/etsi/t3d/T3D.java =================================================================== --- trunk/t3d/src/org/etsi/t3d/T3D.java (revision 7) +++ trunk/t3d/src/org/etsi/t3d/T3D.java (revision 7) @@ -0,0 +1,838 @@ +package org.etsi.t3d; + + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.ParseException; +import org.etsi.t3d.config.T3DConfig; +import org.etsi.t3d.config.DocumentationProfile; +import org.etsi.t3d.config.T3DOptionsHandler; +import org.etsi.t3d.exceptions.TTCN3BehaviorException; +import org.etsi.t3d.exceptions.TTCN3ParserException; +import org.etsi.t3d.visitor.DependencyVisitor; +import org.etsi.t3d.visitor.ImportVisitor; +import org.etsi.t3d.visitor.T3DVisitor; +import org.etsi.common.InputInterface; +import org.etsi.common.MiscTools; +import org.etsi.common.configuration.ConfigTools; +import org.etsi.common.exceptions.TerminationException; +import org.etsi.common.logging.LoggingInterface; +import org.etsi.common.logging.LoggingInterface.LogLevel; +import org.xml.sax.SAXException; + +import antlr.MismatchedTokenException; +import antlr.RecognitionException; +import antlr.TokenStreamException; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3Analyzer; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3AnalyzerFlyweightFactory; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3Parser; + +public class T3D { + + public static String versionNumber = "v1.0.2"; + //set during automated server builds + private static String buildStamp = "---BUILD_STAMP---"; + public static DocumentationProfile activeProfile = null; + private String configurationClassName = T3DConfig.class.getName(); + private String configurationProfileClassName = DocumentationProfile.class.getName(); + private String configurationFilename; + private String selectedProfileName = null; + private static LogLevel logLevel = LogLevel.INFORMATION; + + private HashMap argsMap = new HashMap(); + private ArrayList inputPaths = new ArrayList(); + private String destinationPath = null; + + private HashMap linesOfCodeMap = new HashMap(); + private int totalLoc = 0; + + private boolean generateNewConfiguration = false; + + private static boolean generateMainXML = false; + private static boolean generateDependenciesXML = false; + private static boolean generateHTML = false; + + private static XMLPrinter xmlPrinter; + private static ImportPrinter importPrinter; + private static DependencyPrinter depPrinter; + //TODO: START HERE, remove and substitute by a method that derives the names based on the TTCN3ParserTokenTypes + //WHAT ABOUT EXTERNAL FUNCTIONS??? + //public final static String elementTypes[] = {"Module", "Function", "Testcase", "Group", "Altstep", "Constant", "Module Parameter", "Template", "Type", "Signature"}; + private static final String documentationLogFile = "log.xml"; + private static final String documentationXmlFile = "project.xml"; + private static final String dependencyXmlFile = "dependencies.xml"; + private static final String importXmlFile = "imports.xml"; + private String xsdFile = System.getenv("T3D_HOME")+"/xsd/project_schema.xsd"; + + //private static T3DLoggingInterface loggingInterface = new T3DLoggingInterface(); + + //TODO: TEMPORARY SOLUTION UNTIL MAJOR OTHER ISSUES ARE RESOLVED + private static LoggingInterface logger = null; + + public T3D() { + } + +// public static void printLog(int LEVEL, String filename, int startLine, int endLine, int type, String output){ +// loggingInterface.printLog(LEVEL, filename, startLine, endLine, type, output); +// } + + // -------------------------------------------------------------------------- + + public void showHelp() { + System.out.println("\nHelp:"); +// System.out.println(" t3d[.bat] [options] (path | filename)+"); +// System.out.println(""); +// System.out.println(" Options (specify in any order): "); +// System.out.println(" --help - prints this screen"); +// System.out.println(" --profile [profilename] - allows manual profile selection, overriding the selected default profile"); +// System.out.println(""); + HelpFormatter formatter = new HelpFormatter(); + formatter.setOptionComparator(new Comparator