Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences preferences.jsp.vsl
|
From: Chad B. <cwb...@us...> - 2007-07-19 17:11:10
|
User: cwbrandon
Date: 07/07/19 10:11:07
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences
preferences.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/preferences
Preferences.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/configuration
faces-config.xml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences
preferences.jsp.vsl
Log:
get rid of unused menu selection preference
Revision Changes Path
1.7 +0 -2 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- cartridge.xml 9 Jul 2007 17:55:08 -0000 1.6
+++ cartridge.xml 19 Jul 2007 17:11:05 -0000 1.7
@@ -28,8 +28,6 @@
<property reference="managedBeansPackage"/>
<property reference="preferencesClassName"/>
<property reference="preferencesBeanName"/>
- <property reference="menuLayout"/>
- <property reference="menuTheme"/>
<property reference="applicationName"/>
<property reference="formPopulatorName"/>
<property reference="exceptionHandlerPattern"/>
1.4 +13 -34 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- namespace.xml 20 Feb 2007 10:10:32 -0000 1.3
+++ namespace.xml 19 Jul 2007 17:11:05 -0000 1.4
@@ -148,33 +148,12 @@
Defines the bean name under which the preferences class will be stored.
</documentation>
</property>
- <property name="menuLayout">
- <default>vbr</default>
- <documentation>
- The menu layout. Valid values are:
- <ul>
- <li>hbr</li>
- <li>hur</li>
- <li>hul</li>
- <li>vbr</li>
- <li>vur</li>
- <li>vur</li>
- </ul>
- </documentation>
- </property>
<property name="maxTableRows">
<default>10</default>
<documentation>
The dfault value to set for the maximum rows displayed in a table.
</documentation>
</property>
- <property name="menuTheme">
- <default>ThemePanel</default>
- <documentation>
- The navigation theme to use (the possible choices are:
- ThemeOffice, ThemeMiniBlack, ThemeIE, ThemePanel).
- </documentation>
- </property>
<property name="navigationStyle">
<default>sidebar</default>
<documentation>Controls the way navigation items are displayed</documentation></property>
1.5 +0 -6 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl
Index: preferences.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/preferences/preferences.xhtml.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- preferences.xhtml.vsl 5 Jul 2007 17:09:25 -0000 1.4
+++ preferences.xhtml.vsl 19 Jul 2007 17:11:06 -0000 1.5
@@ -13,12 +13,6 @@
<ui:define name="content">
<tr:form id="$preferencesBeanName">
<tr:panelFormLayout>
- <tr:selectOneChoice id="menuTheme" value="#{${preferencesBeanName}.menuTheme}" label="#{messages['preferences.menu.theme']}:">
- <f:selectItem itemLabel="Office" itemValue="ThemeOffice"/>
- <f:selectItem itemLabel="Mini Black" itemValue="ThemeMiniBlack"/>
- <f:selectItem itemLabel="IE" itemValue="ThemeIE"/>
- <f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
- </tr:selectOneChoice>
<tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
<f:selectItem itemLabel="Default" itemValue="default"/>
<f:selectItem itemLabel="Beach" itemValue="beach"/>
1.2 +12 -24 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/preferences/Preferences.java.vsl
Index: Preferences.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/preferences/Preferences.java.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Preferences.java.vsl 5 Dec 2006 19:39:32 -0000 1.1
+++ Preferences.java.vsl 19 Jul 2007 17:11:06 -0000 1.2
@@ -10,21 +10,6 @@
public class $preferencesClassName
implements java.io.Serializable
{
- private String menuTheme;
-
- /**
- * The theme to use for the JSCookMenu.
- */
- public String getMenuTheme()
- {
- return this.menuTheme;
- }
-
- public void setMenuTheme(final String menuTheme)
- {
- this.menuTheme = menuTheme;
- }
-
/**
* The skin to apply.
*/
@@ -52,9 +37,12 @@
public void setMaxTableRows(final String maxTableRows)
{
- try {
+ try
+ {
this.maxTableRows = Integer.parseInt(maxTableRows);
- } catch (Exception ex) {
+ }
+ catch (Exception ex)
+ {
this.maxTableRows = 1;
}
}
1.11 +4 -8 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl
Index: faces-config.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- faces-config.xml.vsl 1 Jul 2007 19:17:49 -0000 1.10
+++ faces-config.xml.vsl 19 Jul 2007 17:11:06 -0000 1.11
@@ -286,10 +286,6 @@
<property-name>skin</property-name>
<value>$skin</value>
</managed-property>
- <managed-property>
- <property-name>menuTheme</property-name>
- <value>$menuTheme</value>
- </managed-property>
#if ($stringUtils.isNotBlank($maxTableRows))
<managed-property>
<property-name>maxTableRows</property-name>
1.3 +10 -16 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl
Index: preferences.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/preferences/preferences.jsp.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- preferences.jsp.vsl 12 Dec 2006 18:46:32 -0000 1.2
+++ preferences.jsp.vsl 19 Jul 2007 17:11:07 -0000 1.3
@@ -38,12 +38,6 @@
</f:facet>
<h:form id="$preferencesBeanName">
<tr:panelFormLayout>
- <tr:selectOneChoice id="theme" value="#{${preferencesBeanName}.menuTheme}" label="#{messages['preferences.menu.theme']}:">
- <f:selectItem itemLabel="Office" itemValue="ThemeOffice"/>
- <f:selectItem itemLabel="Mini Black" itemValue="ThemeMiniBlack"/>
- <f:selectItem itemLabel="IE" itemValue="ThemeIE"/>
- <f:selectItem itemLabel="Panel" itemValue="ThemePanel"/>
- </tr:selectOneChoice>
<tr:selectOneChoice id="skin" value="#{${preferencesBeanName}.skin}" label="#{messages['preferences.skin']}:">
<f:selectItem itemLabel="Default" itemValue="default"/>
<f:selectItem itemLabel="Beach" itemValue="beach"/>
|
