Update of /cvsroot/struts-menu/navigator
In directory sc8-pr-cvs1:/tmp/cvs-serv5193
Modified Files:
navigator.iws
Log Message:
fixed bug where an invalid forward or mapping killed all menus. Also added ability to
define the config in menu-config.xml (convenient for Velocity templates)
Index: navigator.iws
===================================================================
RCS file: /cvsroot/struts-menu/navigator/navigator.iws,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** navigator.iws 1 Dec 2003 06:36:33 -0000 1.5
--- navigator.iws 18 Dec 2003 23:21:18 -0000 1.6
***************
*** 3,49 ****
<component name="FileEditorManager">
<history>
! <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="2"
column="9" vertical-scroll-proportion="-2.8810022"
horizontal-scroll-proportion="0.066596195" />
! <source-position-entry url="file://$PROJECT_DIR$/web/WEB-INF/menu-config.xml"
line="21" column="60" vertical-scroll-proportion="0.52609605"
horizontal-scroll-proportion="0.44397464" />
! <source-position-entry url="file://$PROJECT_DIR$/web/velocity-nicetabs.jsp"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/dhtmlDropdown.jsp"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/example/DisplaySourceServlet.java"
line="42" column="54" vertical-scroll-proportion="0.32934132"
horizontal-scroll-proportion="0.39664218" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/UseMenuDisplayerTag.java"
line="33" column="13" vertical-scroll-proportion="0.26946107"
horizontal-scroll-proportion="0.096194506" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/DisplayMenuTag.java"
line="193" column="41" vertical-scroll-proportion="0.35479042"
horizontal-scroll-proportion="0.30338266">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/devguide.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/faq.xml" line="13"
column="18" vertical-scroll-proportion="0.23353294"
horizontal-scroll-proportion="0.13221405" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/userguide.xml"
line="144" column="78" vertical-scroll-proportion="0.65868264"
horizontal-scroll-proportion="0.57716703" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/status.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/index.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/navigation.xml"
line="23" column="63" vertical-scroll-proportion="0.41317365"
horizontal-scroll-proportion="0.4627492" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/tasks.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/changes.xml" line="20"
column="57" vertical-scroll-proportion="0.35928145"
horizontal-scroll-proportion="0.41867787" />
</history>
<open-files>
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/navigation.xml"
line="23" column="63" vertical-scroll-proportion="0.41317365"
horizontal-scroll-proportion="0.4627492" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/devguide.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/faq.xml" line="13"
column="18" vertical-scroll-proportion="0.23353294"
horizontal-scroll-proportion="0.13221405" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/index.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/status.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/changes.xml" line="20"
column="57" vertical-scroll-proportion="0.35928145"
horizontal-scroll-proportion="0.41867787" selected="true" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/UseMenuDisplayerTag.java"
line="33" column="13" vertical-scroll-proportion="0.26946107"
horizontal-scroll-proportion="0.096194506" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/DisplayMenuTag.java"
line="193" column="41" vertical-scroll-proportion="0.35479042"
horizontal-scroll-proportion="0.30338266">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/tasks.xml" line="5"
column="34" vertical-scroll-proportion="0.08982036"
horizontal-scroll-proportion="0.24973767" />
! <source-position-entry url="file://$PROJECT_DIR$/xdocs/userguide.xml"
line="144" column="78" vertical-scroll-proportion="0.65868264"
horizontal-scroll-proportion="0.57716703" />
</open-files>
</component>
<component name="ToolWindowManager">
! <frame x="0" y="22" width="1440" height="849" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
! <window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.24932249" order="5" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
--- 3,49 ----
<component name="FileEditorManager">
<history>
! <source-position-entry url="file://$PROJECT_DIR$/web/velocity.jsp" line="23"
column="0" vertical-scroll-proportion="0.41566265" horizontal-scroll-proportion="0.0"
/>
! <source-position-entry url="file://$PROJECT_DIR$/web/WEB-INF/menu-config.xml"
line="20" column="0" vertical-scroll-proportion="0.36144578"
horizontal-scroll-proportion="0.0" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/displayer/VelocityMenuDisplayer.java"
line="36" column="13" vertical-scroll-proportion="-1.6972891"
horizontal-scroll-proportion="0.097222224" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/displayer/MessageResourcesMenuDisplayer.java"
line="22" column="22" vertical-scroll-proportion="0.27108434"
horizontal-scroll-proportion="0.16452992" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/menu/MenuPlugIn.java" line="24"
column="13" vertical-scroll-proportion="0.28915662"
horizontal-scroll-proportion="0.09650053" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/menu/MenuRepository.java"
line="27" column="13" vertical-scroll-proportion="-0.004518072"
horizontal-scroll-proportion="0.097222224" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/DisplayMenuTag.java"
line="133" column="21" vertical-scroll-proportion="-1.8222891"
horizontal-scroll-proportion="0.15705128">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/UseMenuDisplayerTag.java"
line="141" column="68" vertical-scroll-proportion="0.64006025"
horizontal-scroll-proportion="0.508547" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/displayer/MenuDisplayerMapping.java"
line="27" column="107" vertical-scroll-proportion="0.13253012"
horizontal-scroll-proportion="0.7942736" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/indextabs.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/nicetabs.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/index.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/coolmenus.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/table.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/tabs.html"
line="15" column="4" vertical-scroll-proportion="0.27108434"
horizontal-scroll-proportion="0.029692471" />
</history>
<open-files>
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/DisplayMenuTag.java"
line="133" column="21" vertical-scroll-proportion="-1.8222891"
horizontal-scroll-proportion="0.15705128">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/menu/MenuRepository.java"
line="27" column="13" vertical-scroll-proportion="-0.004518072"
horizontal-scroll-proportion="0.097222224" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/displayer/MenuDisplayerMapping.java"
line="27" column="107" vertical-scroll-proportion="0.13253012"
horizontal-scroll-proportion="0.7942736" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/indextabs.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/nicetabs.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/index.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/coolmenus.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/table.html"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
! <source-position-entry url="file://$PROJECT_DIR$/web/templates/tabs.html"
line="15" column="4" vertical-scroll-proportion="0.27108434"
horizontal-scroll-proportion="0.029692471" selected="true" />
! <source-position-entry
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib/UseMenuDisplayerTag.java"
line="141" column="68" vertical-scroll-proportion="0.64006025"
horizontal-scroll-proportion="0.508547" />
</open-files>
</component>
<component name="ToolWindowManager">
! <frame x="1" y="22" width="1440" height="849" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
! <window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="true" weight="0.25" order="2" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.24932249" order="5" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
***************
*** 51,55 ****
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false"
internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
! <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="true" weight="0.24501425" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.4" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
--- 51,55 ----
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false"
internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
! <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.245" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.4" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
***************
*** 263,285 ****
<navigator currentView="ProjectPane" flattenPackages="false" showMembers="false"
showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
<view id="ProjectPane">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net" />
- <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/menu" />
- <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/example" />
- <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator" />
<expanded_node type="directory" url="file://$PROJECT_DIR$" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/xdocs" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/web/templates" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/web/WEB-INF" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/web" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net/sf" />
</view>
<view id="SourcepathPane">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net/sf" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
</view>
<view id="ClasspathPane" />
--- 263,287 ----
<navigator currentView="ProjectPane" flattenPackages="false" showMembers="false"
showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
<view id="ProjectPane">
<expanded_node type="directory" url="file://$PROJECT_DIR$" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/web/templates" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/web/WEB-INF/classes"
/>
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net/sf" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/web/WEB-INF" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/example" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/menu" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/web" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/taglib" />
! <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator" />
! <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator/displayer" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net" />
! <expanded_node type="directory" url="file://$PROJECT_DIR$/xdocs" />
</view>
<view id="SourcepathPane">
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/net/sf/navigator" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net/sf" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/net" />
</view>
<view id="ClasspathPane" />
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
struts-menu-devel mailing list
[EMAIL PROTECTED]
https://lists.sf.net/lists/listinfo/struts-menu-devel
