KATOH Yasufumi
karma****@users*****
2007年 2月 13日 (火) 21:51:20 JST
Update of /cvsroot/pal/weather/src/java/jp/sf/pal/weather In directory sf-cvs:/tmp/cvs-serv18106/src/java/jp/sf/pal/weather Modified Files: WeatherPortlet.java Log Message: 3日分の天気を表示可能とした．jspファイルを一本化した． weather/src/java/jp/sf/pal/weather/WeatherPortlet.java 1.11 -> 1.12 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/java/jp/sf/pal/weather/WeatherPortlet.java.diff?r1=1.11&r2=1.12 =================================================================== RCS file: weather/src/java/jp/sf/pal/weather/WeatherPortlet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- WeatherPortlet.java 2007/02/13 07:45:44 1.11 +++ WeatherPortlet.java 2007/02/13 12:51:20 1.12 @@ -48,11 +48,15 @@ public static final String TOMORROW_WEATHER_ATTR_NAME = "tomorrowweather" ; /** Parameter Name of The Day After Tomorror (checkbox) */ - public static final String DAYAFTERTOMORROW_ATTR_NAME = "dayaftertomorrow"; + public static final String DAYAFTERTOMORROW_WEATHER_ATTR_NAME = "dayaftertomorrowweather"; /** Parameter Name of Description Display Mode (checkbox) */ public static final String DESCRIPTIONDISPMODE_ATTR_NAME = "description"; + public static final String IS_TODAY_WEATHER_DISPLAYED_ATTR_NAME = "istodaydisplay"; + public static final String IS_TOMORROW_WEATHER_DISPLAYED_ATTR_NAME = "istomorrowdisplay"; + public static final String IS_DAYAFTERTOMORROW_WEATHER_DISPLAYED_ATTR_NAME = "isdayaftertomorrowdisplay"; + // // Parameter Name // @@ -128,36 +132,46 @@ Weather today_weather = null ; boolean dispToday = prefs.getValue(TODAY_PARAM_NAME, null).equals(DAY_PARAM_ON_VALUE) ; + request.setAttribute(IS_TODAY_WEATHER_DISPLAYED_ATTR_NAME, new Boolean(dispToday)); if (dispToday) { WeatherWebService todayService = new WeatherWebService(id); todayService.setDay(TODAY_PARAM_NAME) ; today_weather = todayService.getWeather() ; + request.setAttribute(TODAY_WEATHER_ATTR_NAME, today_weather); } // 明日の天気の取得 Weather tomorrow_weather = null ; boolean dispTomorrow = prefs.getValue(TOMORROW_PARAM_NAME, null).equals(DAY_PARAM_ON_VALUE) ; + request.setAttribute(IS_TOMORROW_WEATHER_DISPLAYED_ATTR_NAME, new Boolean(dispTomorrow)); if (dispTomorrow) { WeatherWebService tomorrowService = new WeatherWebService(id); tomorrowService.setDay(TOMORROW_PARAM_NAME) ; tomorrow_weather = tomorrowService.getWeather() ; + request.setAttribute(TOMORROW_WEATHER_ATTR_NAME, tomorrow_weather); } - // 天気のセット - if (dispToday && !dispTomorrow) { - request.setAttribute(WEATHER_ATTR_NAME, today_weather); - } - if (!dispToday && dispTomorrow) { - request.setAttribute(WEATHER_ATTR_NAME, tomorrow_weather); - } - if (dispToday && dispTomorrow) { - request.setAttribute(TODAY_WEATHER_ATTR_NAME, today_weather); - request.setAttribute(TOMORROW_WEATHER_ATTR_NAME, tomorrow_weather) ; - } - if (!dispToday && !dispTomorrow) { - // TODO: 今日も明日もチェックされなかったときのエラー処理 + // あさっての天気の取得 + Weather dayaftertomorrow_weather = null ; + boolean dispDayAfterTomorrow + = prefs.getValue(DAYAFTERTOMORROW_PARAM_NAME, null).equals(DAY_PARAM_ON_VALUE); + request.setAttribute(IS_DAYAFTERTOMORROW_WEATHER_DISPLAYED_ATTR_NAME, new Boolean(dispDayAfterTomorrow)); + if (dispDayAfterTomorrow) { + WeatherWebService dayAfterTomorrowService = new WeatherWebService(id); + dayAfterTomorrowService.setDay(DAYAFTERTOMORROW_PARAM_NAME); + dayaftertomorrow_weather = dayAfterTomorrowService.getWeather() ; + request.setAttribute(DAYAFTERTOMORROW_WEATHER_ATTR_NAME, dayaftertomorrow_weather); + } + + if (!dispToday) { + if (dispTomorrow) { + request.setAttribute(TODAY_WEATHER_ATTR_NAME, tomorrow_weather); + } else { + request.setAttribute(TODAY_WEATHER_ATTR_NAME, dayaftertomorrow_weather); + } } + request.setAttribute(CITYMAP_ATTR_NAME, cityMap) ; request.setAttribute(CITYID_ATTR_NAME, id) ; @@ -168,11 +182,7 @@ // inclde JSP PortletRequestDispatcher rd = null ; - if (!(dispToday && dispTomorrow)) { - rd = context.getRequestDispatcher(VIEW_MODE_ONE_DAY_JSP_PATH) ; - } else { - rd = context.getRequestDispatcher(VIEW_MODE_TWO_DAYS_JSP_PATH) ; - } + rd = context.getRequestDispatcher(VIEW_MODE_ONE_DAY_JSP_PATH) ; rd.include(request, response); }
