From: Patrice G. <pat...@us...> - 2002-08-29 18:16:03
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb In directory usw-pr-cvs1:/tmp/cvs-serv10072/Sources/er/directtoweb Modified Files: ERDListOrganizer.java Log Message: cleanup Index: ERDListOrganizer.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERDListOrganizer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ERDListOrganizer.java 24 Jul 2002 20:55:36 -0000 1.5 --- ERDListOrganizer.java 29 Aug 2002 18:16:00 -0000 1.6 *************** *** 32,35 **** --- 32,41 ---- public String entityForReportName; + private final static String DASH="-"; + private final static String DASHES="--------------------------------------------------------"; + private final static ERXKeyValuePair DEFAULT_PAIR=new ERXKeyValuePair(DASH, DASHES); + private final static NSArray DEFAULT_ARRAY=new NSArray(DEFAULT_PAIR); + + public void reset(){ super.reset(); *************** *** 50,56 **** cat.debug("availableElements = " +ERDirectToWeb.displayableArrayForKeyPathArray((NSArray)object().valueForKeyPath(key()+"Available"), ! entityForReportName, ERXLocalizer.localizerForSession(session()).language())); return ERDirectToWeb.displayableArrayForKeyPathArray((NSArray)object().valueForKeyPath(key()+"Available"), ! entityForReportName, ERXLocalizer.localizerForSession(session()).language()); } --- 56,65 ---- cat.debug("availableElements = " +ERDirectToWeb.displayableArrayForKeyPathArray((NSArray)object().valueForKeyPath(key()+"Available"), ! entityForReportName, ! ERXLocalizer.localizerForSession(session()).language())); ! return ERDirectToWeb.displayableArrayForKeyPathArray((NSArray)object().valueForKeyPath(key()+"Available"), ! entityForReportName, ! ERXLocalizer.localizerForSession(session()).language()); } *************** *** 65,88 **** if(cat.isDebugEnabled()) cat.debug("keyPathsArray = "+keyPathsArray); if(keyPathsArray!=null){ ! chosenObjects = ERDirectToWeb.displayableArrayForKeyPathArray(keyPathsArray, entityForReportName, ERXLocalizer.localizerForSession(session()).language()); ! if(((ERXSession)session()).browser().isNetscape()){ NSMutableArray tmp = new NSMutableArray(); ! ERXKeyValuePair defaultObject = ! new ERXKeyValuePair(new String("-"), ! new String("--------------------------------------------------------")); ! tmp.addObject(defaultObject); tmp.addObjectsFromArray(chosenObjects); chosenObjects = (NSArray)tmp; } chosenKeyPathes = keyPathsArray.componentsJoinedByString ( "," ); ! }else{ ! chosenObjects = new NSArray(); } if(cat.isDebugEnabled()) cat.debug("chosenObjects = "+chosenObjects); ! }else if(((ERXSession)session()).browser().isNetscape()){ ! ERXKeyValuePair defaultObject = ! new ERXKeyValuePair(new String("-"), ! new String("--------------------------------------------------------")); ! chosenObjects = new NSArray(defaultObject); } } --- 74,93 ---- if(cat.isDebugEnabled()) cat.debug("keyPathsArray = "+keyPathsArray); if(keyPathsArray!=null){ ! chosenObjects = ERDirectToWeb.displayableArrayForKeyPathArray(keyPathsArray, ! entityForReportName, ! ERXLocalizer.localizerForSession(session()).language()); ! if(((ERXSession)session()).browser().isNetscape()) { NSMutableArray tmp = new NSMutableArray(); ! tmp.addObject(DEFAULT_PAIR); tmp.addObjectsFromArray(chosenObjects); chosenObjects = (NSArray)tmp; } chosenKeyPathes = keyPathsArray.componentsJoinedByString ( "," ); ! }else { ! chosenObjects = ERXConstant.EmptyArray; } if(cat.isDebugEnabled()) cat.debug("chosenObjects = "+chosenObjects); ! } else if(((ERXSession)session()).browser().isNetscape()) { ! chosenObjects = DEFAULT_ARRAY; } } *************** *** 106,110 **** try{ object().validateTakeValueForKeyPath(value, key()); ! }catch (NSValidation.ValidationException v) { parent().validationFailedWithException(v,value,key()); } --- 111,115 ---- try{ object().validateTakeValueForKeyPath(value, key()); ! } catch (NSValidation.ValidationException v) { parent().validationFailedWithException(v,value,key()); } |