Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java Fri Mar 24 15:36:48 2006 @@ -27,17 +27,17 @@ public class WorkbenchValidationDelegate extends ValidationDelegate { + private static final long serialVersionUID = -4782900422264574280L; - public void writeAttributes(IMarkupWriter writer, IRequestCycle cycle, + public void writeAttributes(IMarkupWriter writer, IRequestCycle cycle, IFormComponent component, IValidator validator) { - if (isInError()) - writer.attribute("class", "field-error"); + if (isInError()) writer.attribute("class", "field-error"); } - public void writeSuffix(IMarkupWriter writer, IRequestCycle cycle, IFormComponent component, - IValidator validator) + public void writeSuffix(IMarkupWriter writer, IRequestCycle cycle, + IFormComponent component, IValidator validator) { if (isInError()) { @@ -48,29 +48,34 @@ writer.attribute("width", 20); } } - + + /** + * [EMAIL PROTECTED] + */ + public void writeLabelPrefix(IFormComponent component, + IMarkupWriter writer, IRequestCycle cycle) + { + // just prevents font tags + } + /** - * [EMAIL PROTECTED] } + * [EMAIL PROTECTED] */ - public void writeLabelPrefix(IFormComponent component, IMarkupWriter writer, IRequestCycle cycle) + public void writeLabelSuffix(IFormComponent component, + IMarkupWriter writer, IRequestCycle cycle) { - //just prevents font tags + // just prevents font tags } - + /** - * [EMAIL PROTECTED] } + * [EMAIL PROTECTED] */ - public void writeLabelSuffix(IFormComponent component, IMarkupWriter writer, IRequestCycle cycle) + public void writeLabelAttributes(IMarkupWriter writer, IRequestCycle cycle, + IFormComponent component) { - //just prevents font tags + if (isInError(component)) + { + writer.attribute("class", "error"); + } } - - /** - * [EMAIL PROTECTED] - */ - public void writeLabelAttributes(IMarkupWriter writer, IRequestCycle cycle, IFormComponent component) { - if (isInError(component)) { - writer.attribute("class", "error"); - } - } -} \ No newline at end of file +}
Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/IChartProvider.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/IChartProvider.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/IChartProvider.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/IChartProvider.java Fri Mar 24 15:36:48 2006 @@ -25,5 +25,6 @@ public interface IChartProvider { - public Chart getChart(); -} \ No newline at end of file + + Chart getChart(); +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/PlotValue.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/PlotValue.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/PlotValue.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/chart/PlotValue.java Fri Mar 24 15:36:48 2006 @@ -27,9 +27,9 @@ { private static final long serialVersionUID = 4847193821463693432L; - private String name; + private String _name; - private int value; + private int _value; public PlotValue() { @@ -37,28 +37,28 @@ public PlotValue(String name, int value) { - this.name = name; - this.value = value; + this._name = name; + this._value = value; } public String getName() { - return name; + return _name; } public void setName(String name) { - this.name = name; + this._name = name; } public int getValue() { - return value; + return _value; } public void setValue(int value) { - this.value = value; + this._value = value; } public String toString() @@ -66,11 +66,11 @@ StringBuffer buffer = new StringBuffer("PlotValue@"); buffer.append(Integer.toHexString(hashCode())); buffer.append('['); - buffer.append(name); + buffer.append(_name); buffer.append(' '); - buffer.append(value); + buffer.append(_value); buffer.append(']'); return buffer.toString(); } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/fields/Fields.java Fri Mar 24 15:36:48 2006 @@ -28,6 +28,7 @@ public abstract class Fields extends BasePage { + public static final int INT_MIN = 5; public static final int INT_MAX = 20; @@ -66,4 +67,4 @@ * @since 4.0 */ public abstract IValidationDelegate getDelegate(); -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocaleModel.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocaleModel.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocaleModel.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocaleModel.java Fri Mar 24 15:36:48 2006 @@ -75,4 +75,4 @@ return _locales.get(index); } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/Localization.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/Localization.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/Localization.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/Localization.java Fri Mar 24 15:36:48 2006 @@ -27,6 +27,7 @@ public abstract class Localization extends BasePage { + private IPropertySelectionModel localeModel; public void formSubmit(IRequestCycle cycle) @@ -36,8 +37,7 @@ public IPropertySelectionModel getLocaleModel() { - if (localeModel == null) - localeModel = buildLocaleModel(); + if (localeModel == null) localeModel = buildLocaleModel(); return localeModel; } @@ -54,4 +54,4 @@ return model; } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocalizationChange.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocalizationChange.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocalizationChange.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/localization/LocalizationChange.java Fri Mar 24 15:36:48 2006 @@ -24,6 +24,7 @@ public abstract class LocalizationChange extends BasePage { + private String localeName; public String getLocaleName() @@ -37,4 +38,4 @@ return localeName; } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java Fri Mar 24 15:36:48 2006 @@ -31,6 +31,11 @@ public abstract class Palette extends BasePage { + private IPropertySelectionModel colorModel; + + private String[] colors = + { "Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet" }; + public abstract List getSelectedColors(); @Persist("client:app") @@ -66,11 +71,6 @@ return results; } - private IPropertySelectionModel colorModel; - - private String[] colors = - { "Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet" }; - public IPropertySelectionModel getColorModel() { if (colorModel == null) @@ -78,4 +78,4 @@ return colorModel; } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/PaletteResults.java Fri Mar 24 15:36:48 2006 @@ -25,6 +25,7 @@ public abstract class PaletteResults extends BasePage { + public abstract void setSelectedColors(List value); -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/SortModeStrings.properties URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/SortModeStrings.properties?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/SortModeStrings.properties (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/SortModeStrings.properties Fri Mar 24 15:36:48 2006 @@ -15,4 +15,4 @@ NONE=None LABEL=Label VALUE=Value -USER=Manual \ No newline at end of file +USER=Manual Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleList.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleList.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleList.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleList.java Fri Mar 24 15:36:48 2006 @@ -30,9 +30,6 @@ public abstract class LocaleList extends BaseComponent { - @Parameter(required = true) - public abstract ILocaleSelectionListener getLocaleSelectionListener(); - // immutable values private IPrimaryKeyConvertor m_objLocaleConvertor; @@ -42,6 +39,7 @@ // a Locale object as a String and converts it back m_objLocaleConvertor = new IPrimaryKeyConvertor() { + public Object getPrimaryKey(Object objValue) { Locale objLocale = (Locale) objValue; @@ -50,7 +48,8 @@ public Object getValue(Object objPrimaryKey) { - StringTokenizer objTokenizer = new StringTokenizer((String) objPrimaryKey, "_"); + StringTokenizer objTokenizer = new StringTokenizer( + (String) objPrimaryKey, "_"); String strLanguage = ""; if (objTokenizer.hasMoreTokens()) @@ -69,6 +68,9 @@ }; } + @Parameter(required = true) + public abstract ILocaleSelectionListener getLocaleSelectionListener(); + public IPrimaryKeyConvertor getLocaleConvertor() { return m_objLocaleConvertor; @@ -86,8 +88,7 @@ if (bSelected) setSelectedLocales.add(objLocale); - else - setSelectedLocales.remove(objLocale); + else setSelectedLocales.remove(objLocale); // persist value setSelectedLocales(setSelectedLocales); @@ -112,4 +113,4 @@ public abstract Set getSelectedLocales(); public abstract void setSelectedLocales(Set set); -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleSelection.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleSelection.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleSelection.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/LocaleSelection.java Fri Mar 24 15:36:48 2006 @@ -29,8 +29,10 @@ /** * @author mindbridge */ -public abstract class LocaleSelection extends BaseComponent implements ILocaleSelectionListener +public abstract class LocaleSelection extends BaseComponent implements + ILocaleSelectionListener { + // properties public abstract Locale getCurrentLocale(); @@ -45,13 +47,14 @@ { Set objLocaleSet = getLocaleSet(); addAll(objLocaleSet, arrLocales); - // ensure that the framework knows about the change and the set is persisted + // ensure that the framework knows about the change and the set is + // persisted setLocaleSet(objLocaleSet); } private void addAll(Set objLocaleSet, Locale[] arrLocales) { - for (int i = 0; i < arrLocales.length; i++) + for(int i = 0; i < arrLocales.length; i++) objLocaleSet.add(arrLocales[i]); } @@ -68,8 +71,8 @@ } /** - * Returns the verbosity of the current locale. This is used by the Block rendering the - * 'Verbosity' column + * Returns the verbosity of the current locale. This is used by the Block + * rendering the 'Verbosity' column * * @return int the current locale verbosity */ @@ -80,8 +83,8 @@ } /** - * Generates the context that will be passed to the deleteLocale() listener if a "remove" link - * is selected. + * Generates the context that will be passed to the deleteLocale() listener + * if a "remove" link is selected. * <p> * This is used by the Block rendering the 'Remove' column. * @@ -90,13 +93,13 @@ public String[] getDeleteLocaleContext() { Locale objLocale = getCurrentLocale(); - return new String[] - { objLocale.getLanguage(), objLocale.getCountry(), objLocale.getVariant() }; + return new String[] { objLocale.getLanguage(), objLocale.getCountry(), + objLocale.getVariant() }; } /** - * A listener invoked when a "remove" link is selected. It removes from the data model the - * locale corresponding to the link. + * A listener invoked when a "remove" link is selected. It removes from the + * data model the locale corresponding to the link. * <p> * * @param objCycle @@ -105,16 +108,17 @@ public void deleteLocale(IRequestCycle objCycle) { Object[] arrParams = objCycle.getListenerParameters(); - Locale objLocale = new Locale(arrParams[0].toString(), arrParams[1].toString(), - arrParams[2].toString()); + Locale objLocale = new Locale(arrParams[0].toString(), arrParams[1] + .toString(), arrParams[2].toString()); getLocaleSet().remove(objLocale); } /** - * A class defining the logic for getting the currency symbol from a locale + * A class defining the logic for getting the currency symbol from a locale. */ private static class CurrencyEvaluator implements ITableColumnEvaluator { + private static final long serialVersionUID = 1L; /** @@ -125,19 +129,20 @@ { Locale objLocale = (Locale) objRow; String strCountry = objLocale.getCountry(); - if (strCountry == null || strCountry.equals("")) - return ""; + if (strCountry == null || strCountry.equals("")) return ""; - DecimalFormatSymbols objSymbols = new DecimalFormatSymbols(objLocale); + DecimalFormatSymbols objSymbols = new DecimalFormatSymbols( + objLocale); return objSymbols.getCurrencySymbol(); } } /** - * A class defining a column for displaying the date format + * A class defining a column for displaying the date format. */ private static class DateFormatColumn extends SimpleTableColumn { + private static final long serialVersionUID = 1L; private Date m_objDate; @@ -152,11 +157,9 @@ { Locale objLocale = (Locale) objRow; DateFormat objFormat = DateFormat.getDateTimeInstance( - DateFormat.LONG, - DateFormat.LONG, - objLocale); + DateFormat.LONG, DateFormat.LONG, objLocale); return objFormat.format(m_objDate); } } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/VerbosityRating.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/VerbosityRating.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/VerbosityRating.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/table/VerbosityRating.java Fri Mar 24 15:36:48 2006 @@ -22,86 +22,87 @@ /** * @author mindbridge - * */ -public class VerbosityRating implements Serializable +public final class VerbosityRating implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * Method calculateVerbosity. - * Please note that this method is relatively slow - * It should not be used often, unless for fun :) - * @param objLocale - * @return int - */ - public static int calculateVerbosity(Locale objLocale) - { - int nWeekDayVerbosity = calculateWeekDayVerbosity(objLocale); - int nMonthVerbosity = calculateMonthVerbosity(objLocale); - return nWeekDayVerbosity + nMonthVerbosity; - } - - public static int calculateWeekDayVerbosity(Locale objLocale) - { - SimpleDateFormat objWeekDay = new SimpleDateFormat("EEEE", objLocale); - - GregorianCalendar objCalendar = new GregorianCalendar(); - objCalendar.set(Calendar.YEAR, 2000); - objCalendar.set(Calendar.MONTH, 0); - objCalendar.set(Calendar.DATE, 1); - - int nCount = 0; - for (int i = 0; i < 7; i++) - { - String strWeekDay = objWeekDay.format(objCalendar.getTime()); - nCount += strWeekDay.length(); - objCalendar.add(Calendar.DATE, 1); - } - - return nCount; - } - - public static int calculateMonthVerbosity(Locale objLocale) - { - SimpleDateFormat objMonth = new SimpleDateFormat("MMMM", objLocale); - - GregorianCalendar objCalendar = new GregorianCalendar(); - objCalendar.set(Calendar.YEAR, 2000); - objCalendar.set(Calendar.MONTH, 0); - objCalendar.set(Calendar.DATE, 1); - - int nCount = 0; - for (int i = 0; i < 12; i++) - { - String strMonth = objMonth.format(objCalendar.getTime()); - nCount += strMonth.length(); - objCalendar.add(Calendar.MONTH, 1); - } - - return nCount; - } - - public static void main(String[] arrArgs) - { - int nMax = 0; - int nMin = 1000; - - System.out.println("Starting"); - - Locale[] arrLocales = Locale.getAvailableLocales(); - for (int i = 0; i < arrLocales.length; i++) - { - Locale objLocale = arrLocales[i]; - int nRating = calculateVerbosity(objLocale); - if (nRating > nMax) - nMax = nRating; - if (nRating < nMin) - nMin = nRating; - } - - System.out.println("Min: " + nMin); - System.out.println("Max: " + nMax); - } + + private static final long serialVersionUID = 1L; + + /* defeat instantiation */ + private VerbosityRating() { } + + /** + * Method calculateVerbosity. Please note that this method is relatively + * slow It should not be used often, unless for fun :) + * + * @param objLocale + * @return int + */ + public static int calculateVerbosity(Locale objLocale) + { + int nWeekDayVerbosity = calculateWeekDayVerbosity(objLocale); + int nMonthVerbosity = calculateMonthVerbosity(objLocale); + return nWeekDayVerbosity + nMonthVerbosity; + } + + public static int calculateWeekDayVerbosity(Locale objLocale) + { + SimpleDateFormat objWeekDay = new SimpleDateFormat("EEEE", objLocale); + + GregorianCalendar objCalendar = new GregorianCalendar(); + objCalendar.set(Calendar.YEAR, 2000); + objCalendar.set(Calendar.MONTH, 0); + objCalendar.set(Calendar.DATE, 1); + + int nCount = 0; + for(int i = 0; i < 7; i++) + { + String strWeekDay = objWeekDay.format(objCalendar.getTime()); + nCount += strWeekDay.length(); + objCalendar.add(Calendar.DATE, 1); + } + + return nCount; + } + + public static int calculateMonthVerbosity(Locale objLocale) + { + SimpleDateFormat objMonth = new SimpleDateFormat("MMMM", objLocale); + + GregorianCalendar objCalendar = new GregorianCalendar(); + objCalendar.set(Calendar.YEAR, 2000); + objCalendar.set(Calendar.MONTH, 0); + objCalendar.set(Calendar.DATE, 1); + + int nCount = 0; + for(int i = 0; i < 12; i++) + { + String strMonth = objMonth.format(objCalendar.getTime()); + nCount += strMonth.length(); + objCalendar.add(Calendar.MONTH, 1); + } + + return nCount; + } + + public static void main(String[] arrArgs) + { + int nMax = 0; + int nMin = 1000; + + System.out.println("Starting"); + + Locale[] arrLocales = Locale.getAvailableLocales(); + for(int i = 0; i < arrLocales.length; i++) + { + Locale objLocale = arrLocales[i]; + int nRating = calculateVerbosity(objLocale); + if (nRating > nMax) nMax = nRating; + if (nRating < nMin) nMin = nRating; + } + + System.out.println("Min: " + nMin); + System.out.println("Max: " + nMax); + } } Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/DirectoryTableView.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/DirectoryTableView.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/DirectoryTableView.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/DirectoryTableView.java Fri Mar 24 15:36:48 2006 @@ -31,7 +31,8 @@ /** * @author ceco */ -public abstract class DirectoryTableView extends BaseComponent implements PageDetachListener +public abstract class DirectoryTableView extends BaseComponent implements + PageDetachListener { private ITableModel m_objTableModel = null; @@ -77,9 +78,11 @@ if (m_objTableModel == null) { ISelectedFolderSource objSelectedFolderSource = getSelectedFolderSource(); - Collection colChildrens = objSelectedFolderSource.getSelectedFolderChildren(); + Collection colChildrens = objSelectedFolderSource + .getSelectedFolderChildren(); - m_objTableModel = new SimpleTableModel(colChildrens.toArray(), getColumns()); + m_objTableModel = new SimpleTableModel(colChildrens.toArray(), + getColumns()); } return m_objTableModel; } @@ -91,9 +94,10 @@ ArrayList arrColumnsList = new ArrayList(); arrColumnsList.add(new SimpleTableColumn("Name", true) { + private static final long serialVersionUID = -5394217017984056107L; - public Object getColumnValue(Object objValue) + public Object getColumnValue(Object objValue) { SFObject objSFObject = (SFObject) objValue; return objSFObject.getName(); @@ -102,9 +106,10 @@ arrColumnsList.add(new SimpleTableColumn("Date", true) { + private static final long serialVersionUID = -3258043732869364037L; - public Object getColumnValue(Object objValue) + public Object getColumnValue(Object objValue) { SFObject objSFObject = (SFObject) objValue; return objSFObject.getDate(); @@ -122,7 +127,8 @@ if (m_objSelectedFolderSource == null) { IBinding objBinding = getBinding("selectedFolderSource"); - m_objSelectedFolderSource = (ISelectedFolderSource) objBinding.getObject(); + m_objSelectedFolderSource = (ISelectedFolderSource) objBinding + .getObject(); } return m_objSelectedFolderSource; } @@ -138,4 +144,4 @@ { return getSelectedFolderSource().getSelectedNodeName(); } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTree.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTree.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTree.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTree.java Fri Mar 24 15:36:48 2006 @@ -39,9 +39,14 @@ import org.apache.tapestry.workbench.tree.examples.fsmodel.FolderObject; import org.apache.tapestry.workbench.tree.examples.fsmodel.NodeRenderFactory; -public abstract class FileSystemTree extends BasePage implements ISelectedFolderSource, - ITreeStateListener, PageDetachListener +/** + * + * @author ceco + */ +public abstract class FileSystemTree extends BasePage implements + ISelectedFolderSource, ITreeStateListener, PageDetachListener { + private ITreeSessionStateManager m_objTreeSessionStateManager = null; private ITreeDataModel m_objDataModel; @@ -54,7 +59,7 @@ public abstract IEngineService getAssetService(); /** - * Injected + * Injected. * * @since 4.0 */ @@ -81,8 +86,8 @@ } else { - FolderObject objFolder = new FolderObject(null, new File(strRootDir), true, - getAssetService()); + FolderObject objFolder = new FolderObject(null, + new File(strRootDir), true, getAssetService()); objFolder.reload(); objParent = objFolder; } @@ -133,7 +138,8 @@ public ITreeSessionStateManager getSessionStateManager() { - // IPage objPage = getRequestCycle().getPage("contrib:TreeNodeViewPage"); + // IPage objPage = + // getRequestCycle().getPage("contrib:TreeNodeViewPage"); // System.out.println("TreeNodeViewPage NamespaceId : // "+objPage.getNamespace().getNamespaceId()); @@ -142,7 +148,8 @@ String strRootDir = getTreeRootDir(); // System.out.println("strRootDir = " + strRootDir); - m_objTreeSessionStateManager = new FileSystemStateManager(strRootDir, getAssetService()); + m_objTreeSessionStateManager = new FileSystemStateManager( + strRootDir, getAssetService()); } return m_objTreeSessionStateManager; } @@ -153,15 +160,17 @@ public Collection getSelectedFolderChildren() { TreeView objTreeView = (TreeView) getComponent("treeView"); - ITreeStateModel objTreeStateModel = objTreeView.getTreeModel().getTreeStateModel(); + ITreeStateModel objTreeStateModel = objTreeView.getTreeModel() + .getTreeStateModel(); Object objSelectedNodeUID = objTreeStateModel.getSelectedNode(); ITreeNode objSelectedNode = null; if (objSelectedNodeUID != null) - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getObject( - objSelectedNodeUID); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getObject(objSelectedNodeUID); else { - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getRoot(); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getRoot(); } return objSelectedNode.getChildren(); } @@ -191,17 +200,19 @@ public String getSelectedNodeName() { TreeView objTreeView = (TreeView) getComponent("treeView"); - ITreeStateModel objTreeStateModel = objTreeView.getTreeModel().getTreeStateModel(); + ITreeStateModel objTreeStateModel = objTreeView.getTreeModel() + .getTreeStateModel(); Object objSelectedNodeUID = objTreeStateModel.getSelectedNode(); ITreeNode objSelectedNode = null; if (objSelectedNodeUID != null) - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getObject( - objSelectedNodeUID); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getObject(objSelectedNodeUID); else { - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getRoot(); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getRoot(); } return objSelectedNode.toString(); } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTreeTable.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTreeTable.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTreeTable.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/FileSystemTreeTable.java Fri Mar 24 15:36:48 2006 @@ -44,9 +44,14 @@ import org.apache.tapestry.workbench.tree.examples.fsmodel.IFileSystemTreeNode; import org.apache.tapestry.workbench.tree.examples.fsmodel.NodeRenderFactory; -public abstract class FileSystemTreeTable extends BasePage implements ISelectedFolderSource, - ITreeStateListener, PageDetachListener +/** + * + * @author ceco + */ +public abstract class FileSystemTreeTable extends BasePage implements + ISelectedFolderSource, ITreeStateListener, PageDetachListener { + private ITreeSessionStateManager m_objTreeSessionStateManager = null; private ITreeDataModel m_objDataModel; @@ -58,7 +63,7 @@ private ArrayList m_arrTableColumns = null; /** - * Injected + * Injected. * * @since 4.0 */ @@ -88,8 +93,8 @@ } else { - FolderObject objFolder = new FolderObject(null, new File(strRootDir), true, - getAssetService()); + FolderObject objFolder = new FolderObject(null, + new File(strRootDir), true, getAssetService()); objFolder.reload(); objParent = objFolder; } @@ -143,7 +148,8 @@ if (m_objTreeSessionStateManager == null) { String strRootDir = getTreeRootDir(); - m_objTreeSessionStateManager = new FileSystemStateManager(strRootDir, getAssetService()); + m_objTreeSessionStateManager = new FileSystemStateManager( + strRootDir, getAssetService()); } return m_objTreeSessionStateManager; } @@ -158,12 +164,14 @@ m_arrTableColumns = new ArrayList(); m_arrTableColumns.add(new SimpleTableColumn("Date", true) { + private static final long serialVersionUID = -8211004113105081255L; public Object getColumnValue(Object objValue) { TreeRowObject objRowObject = (TreeRowObject) objValue; - // SFObject objSFObject = (SFObject)objRowObject.getTreeNode(); + // SFObject objSFObject = + // (SFObject)objRowObject.getTreeNode(); IFileSystemTreeNode objFileSystemTreeNode = (IFileSystemTreeNode) objRowObject .getTreeNode(); return objFileSystemTreeNode.getDate(); @@ -180,15 +188,17 @@ { TreeTable objTreeTable = (TreeTable) getComponent("tree"); ITreeModelSource objTreeModelSource = objTreeTable.getTreeModelSource(); - ITreeStateModel objTreeStateModel = objTreeModelSource.getTreeModel().getTreeStateModel(); + ITreeStateModel objTreeStateModel = objTreeModelSource.getTreeModel() + .getTreeStateModel(); Object objSelectedNodeUID = objTreeStateModel.getSelectedNode(); ITreeNode objSelectedNode = null; if (objSelectedNodeUID != null) - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getObject( - objSelectedNodeUID); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getObject(objSelectedNodeUID); else { - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getRoot(); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getRoot(); } return objSelectedNode.getChildren(); } @@ -219,17 +229,19 @@ { TreeTable objTreeTable = (TreeTable) getComponent("tree"); ITreeModelSource objTreeModelSource = objTreeTable.getTreeModelSource(); - ITreeStateModel objTreeStateModel = objTreeModelSource.getTreeModel().getTreeStateModel(); + ITreeStateModel objTreeStateModel = objTreeModelSource.getTreeModel() + .getTreeStateModel(); Object objSelectedNodeUID = objTreeStateModel.getSelectedNode(); ITreeNode objSelectedNode = null; if (objSelectedNodeUID != null) - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getObject( - objSelectedNodeUID); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getObject(objSelectedNodeUID); else { - objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel().getRoot(); + objSelectedNode = (ITreeNode) getTreeModel().getTreeDataModel() + .getRoot(); } return objSelectedNode.toString(); } -} \ No newline at end of file +} Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/ISelectedFolderSource.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/ISelectedFolderSource.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/ISelectedFolderSource.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/ISelectedFolderSource.java Fri Mar 24 15:36:48 2006 @@ -17,14 +17,15 @@ import java.util.Collection; /** - * All right reserved. - * Copyright (c) by Rushmore Digital Ltd. - * - * Created on Sep 4, 2003 + * All right reserved. Copyright (c) by Rushmore Digital Ltd. Created on Sep 4, + * 2003 * * @author ceco */ -public interface ISelectedFolderSource { - Collection getSelectedFolderChildren(); - String getSelectedNodeName(); +public interface ISelectedFolderSource +{ + + Collection getSelectedFolderChildren(); + + String getSelectedNodeName(); } Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SessionVisit.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SessionVisit.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SessionVisit.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SessionVisit.java Fri Mar 24 15:36:48 2006 @@ -16,7 +16,12 @@ import java.io.Serializable; +/** + * + * @author + */ public class SessionVisit implements Serializable { - private static final long serialVersionUID = 4805064665115445945L; + + private static final long serialVersionUID = 4805064665115445945L; } Modified: jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SimpleTree.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SimpleTree.java?rev=388674&r1=388673&r2=388674&view=diff ============================================================================== --- jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SimpleTree.java (original) +++ jakarta/tapestry/trunk/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/SimpleTree.java Fri Mar 24 15:36:48 2006 @@ -33,7 +33,7 @@ private ITreeModel treeModel; - private Object value; + private Object _value; public SimpleTree() { @@ -43,7 +43,7 @@ { super.detach(); treeDataModel = null; - value = null; + _value = null; } public void init() @@ -89,7 +89,7 @@ */ public Object getValue() { - return value; + return _value; } /** @@ -100,6 +100,6 @@ */ public void setValue(Object value) { - this.value = value; + this._value = value; } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]