Skip to content

Commit 5adde6c

Browse files
jgribonvaldjgribonvald
committed
deps: replacing logger from log4j to slf4j
1 parent 2935dc2 commit 5adde6c

File tree

11 files changed

+331
-325
lines changed

11 files changed

+331
-325
lines changed

‎src/main/java/org/esupportail/portlet/filemanager/portlet/PortletController.java‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
import javax.portlet.WindowState;
2929

3030
import org.apache.commons.collections.map.ListOrderedMap;
31-
import org.apache.log4j.Logger;
3231
import org.esupportail.portlet.filemanager.beans.FormCommand;
3332
import org.esupportail.portlet.filemanager.beans.JsTreeFile;
3433
import org.esupportail.portlet.filemanager.beans.SharedUserPortletParameters;
3534
import org.esupportail.portlet.filemanager.beans.UploadActionType;
3635
import org.esupportail.portlet.filemanager.services.IServersAccessService;
3736
import org.esupportail.portlet.filemanager.services.UserAgentInspector;
3837
import org.esupportail.portlet.filemanager.utils.PathEncodingUtils;
38+
import org.slf4j.Logger;
39+
import org.slf4j.LoggerFactory;
3940
import org.springframework.beans.factory.annotation.Autowired;
4041
import org.springframework.context.annotation.Scope;
4142
import org.springframework.stereotype.Controller;
@@ -48,8 +49,8 @@
4849
@Scope("request")
4950
public class PortletController {
5051

51-
protected Logger log = Logger.getLogger(PortletController.class);
52-
52+
private static final Logger logger = LoggerFactory.getLogger(PortletController.class);
53+
5354
public static final String PREF_PORTLET_VIEW = "defaultPortletView";
5455
public static final String PREF_DEFAULT_PATH = "defaultPath";
5556
public static final String PREF_SHOW_HIDDEN_FILES = "showHiddenFiles";
@@ -58,64 +59,64 @@ public class PortletController {
5859
public static final String PREF_UPLOAD_ACTION_EXIST_FILE = "uploadActionOnExistingFileName";
5960
public static final String PREF_FULL_VIEW_ONLY_MAXIMIZED = "fullDesktopViewOnlyOnMaximizedWindowState";
6061
public static final String PREF_FORCE_MAXIMIZED_4_MOBILE = "forceMaximizedView4MobileWhenBrowsing";
61-
62+
6263
public static final String STANDARD_VIEW = "standard";
6364
public static final String MOBILE_VIEW = "mobile";
6465
public static final String WAI_VIEW = "wai";
65-
66+
6667
@Autowired
6768
protected IServersAccessService serverAccess;
68-
69+
6970
@Autowired
7071
protected UserAgentInspector userAgentInspector;
71-
72+
7273
@Autowired
7374
protected SharedUserPortletParameters userParameters;
7475

7576
@Autowired
7677
protected PathEncodingUtils pathEncodingUtils;
77-
78-
protected void init(PortletRequest request) {
79-
78+
79+
protected void init(PortletRequest request) {
80+
8081
if(!userParameters.isInitialized()) {
8182
String clientIpAdress = request.getProperty("REMOTE_ADDR");
82-
userParameters.init(clientIpAdress);
83-
84-
Map userInfos = (Map) request.getAttribute(PortletRequest.USER_INFO);
83+
userParameters.init(clientIpAdress);
84+
85+
Map userInfos = (Map) request.getAttribute(PortletRequest.USER_INFO);
8586
userParameters.setUserInfos(userInfos);
86-
87+
8788
List<String> driveNames = serverAccess.getRestrictedDrivesGroupsContext(request);
8889
userParameters.setDriveNames(driveNames);
89-
90-
log.info("set SharedUserPortletParameters in application session");
90+
91+
logger.info("set SharedUserPortletParameters in application session");
9192
}
9293

9394
}
94-
95+
9596
@RequestMapping("VIEW")
9697
protected ModelAndView renderView(RenderRequest request, RenderResponse response) throws Exception {
9798
this.init(request);
9899
final PortletPreferences prefs = request.getPreferences();
99100
String defaultPortletView = prefs.getValue(PREF_PORTLET_VIEW, STANDARD_VIEW);
100101
String[] prefsDefaultPathes = prefs.getValues(PREF_DEFAULT_PATH, null);
101-
if(log.isDebugEnabled()) {
102-
log.debug(PREF_DEFAULT_PATH + " preference : ");
102+
if(logger.isDebugEnabled()) {
103+
logger.debug(PREF_DEFAULT_PATH + " preference : ");
103104
for(String prefDefaultPath: prefsDefaultPathes)
104-
log.debug("- " + prefDefaultPath);
105+
logger.debug("- " + prefDefaultPath);
105106
}
106-
107-
boolean showHiddenFiles = "true".equals(prefs.getValue(PREF_SHOW_HIDDEN_FILES, "false"));
107+
108+
boolean showHiddenFiles = "true".equals(prefs.getValue(PREF_SHOW_HIDDEN_FILES, "false"));
108109
userParameters.setShowHiddenFiles(showHiddenFiles);
109-
110+
110111
UploadActionType uploadOption = UploadActionType.valueOf(prefs.getValue(PREF_UPLOAD_ACTION_EXIST_FILE, UploadActionType.OVERRIDE.toString()));
111112
userParameters.setUploadOption(uploadOption);
112113

113114
serverAccess.initializeServices(userParameters);
114-
115+
115116
String defaultPath = serverAccess.getFirstAvailablePath(userParameters, prefsDefaultPathes);
116-
log.info("defaultPath will be : " + defaultPath);
117+
logger.info("defaultPath will be : " + defaultPath);
117118
defaultPath = pathEncodingUtils.encodeDir(defaultPath);
118-
119+
119120
if(userAgentInspector.isMobile(request)) {
120121
return this.browseMobile(request, response, defaultPath);
121122
} else {
@@ -127,39 +128,39 @@ else if(WAI_VIEW.equals(defaultPortletView))
127128
return this.browseStandard(request, response, defaultPath);
128129
}
129130
}
130-
131+
131132
@RequestMapping(value = {"VIEW"}, params = {"action=browseStandard"})
132-
public ModelAndView browseStandard(RenderRequest request, RenderResponse response, String dir) {
133+
public ModelAndView browseStandard(RenderRequest request, RenderResponse response, String dir) {
133134
this.init(request);
134135
final PortletPreferences prefs = request.getPreferences();
135-
boolean useDoubleClick = "true".equals(prefs.getValue(PREF_USE_DOUBLE_CLICK, "true"));
136+
boolean useDoubleClick = "true".equals(prefs.getValue(PREF_USE_DOUBLE_CLICK, "true"));
136137
boolean useCursorWaitDialog = "true".equals(prefs.getValue(PREF_USE_CURSOR_WAIT_DIALOG, "false"));
137-
138-
ModelMap model = new ModelMap();
138+
139+
ModelMap model = new ModelMap();
139140
model.put("useDoubleClick", useDoubleClick);
140141
model.put("useCursorWaitDialog", useCursorWaitDialog);
141142
if(dir == null)
142143
dir = "";
143144
model.put("defaultPath", dir);
144-
145+
145146
boolean fullViewOnlyMaximized = "true".equals(prefs.getValue(PREF_FULL_VIEW_ONLY_MAXIMIZED, "true"));
146147
boolean fullView = !fullViewOnlyMaximized || WindowState.MAXIMIZED.equals(request.getWindowState());
147148
model.put("fullView", fullView);
148-
149+
149150
return new ModelAndView("view-portlet", model);
150151
}
151-
152+
152153
@RequestMapping(value = {"VIEW"}, params = {"action=browseMobile"})
153154
public ModelAndView browseMobile(RenderRequest request, RenderResponse response,
154155
@RequestParam String dir) {
155156
this.init(request);
156-
157+
157158
final PortletPreferences prefs = request.getPreferences();
158-
boolean forceMaximized4Mobile = "true".equals(prefs.getValue(PREF_FORCE_MAXIMIZED_4_MOBILE, "true"));
159+
boolean forceMaximized4Mobile = "true".equals(prefs.getValue(PREF_FORCE_MAXIMIZED_4_MOBILE, "true"));
159160
String forceWindowState4Mobile = forceMaximized4Mobile ? WindowState.MAXIMIZED.toString() : request.getWindowState().toString();
160-
161+
161162
String decodedDir = pathEncodingUtils.decodeDir(dir);
162-
163+
163164
ModelMap model;
164165
if( !(dir == null || dir.length() == 0 || decodedDir.equals(JsTreeFile.ROOT_DRIVE)) ) {
165166
if(this.serverAccess.formAuthenticationRequired(decodedDir, userParameters)) {
@@ -178,19 +179,19 @@ public ModelAndView browseMobile(RenderRequest request, RenderResponse response,
178179
model.put("forceWindowState4Mobile", forceWindowState4Mobile);
179180
return new ModelAndView("view-portlet-mobile", model);
180181
}
181-
182+
182183
@RequestMapping(value = {"VIEW"}, params = {"action=browseWai"})
183184
public ModelAndView browseWai(RenderRequest request, RenderResponse response,
184185
@RequestParam(required=false) String dir,
185186
@RequestParam(required=false) String msg) {
186187
this.init(request);
187-
188+
188189
String decodedDir = pathEncodingUtils.decodeDir(dir);
189-
190+
190191
if(!serverAccess.isInitialized(userParameters)) {
191192
serverAccess.initializeServices(userParameters);
192193
}
193-
194+
194195
ModelMap model;
195196
if( !(dir == null || dir.length() == 0 || decodedDir.equals(JsTreeFile.ROOT_DRIVE)) ) {
196197
if(this.serverAccess.formAuthenticationRequired(decodedDir, userParameters)) {
@@ -200,12 +201,12 @@ public ModelAndView browseWai(RenderRequest request, RenderResponse response,
200201
model.put("parentDir", parentDir);
201202
model.put("username", this.serverAccess.getUserPassword(decodedDir, userParameters).getUsername());
202203
model.put("password", this.serverAccess.getUserPassword(decodedDir, userParameters).getPassword());
203-
if(msg != null)
204+
if(msg != null)
204205
model.put("msg",msg);
205206
return new ModelAndView("authenticationForm-portlet-wai", model);
206207
}
207208
}
208-
209+
209210
model = browse(dir);
210211
FormCommand command = new FormCommand();
211212
model.put("command", command);
@@ -226,17 +227,17 @@ private ModelMap browse(String dir) {
226227
model.put("files", files);
227228
model.put("currentDir", dir);
228229
ListOrderedMap parentsEncPathes = pathEncodingUtils.getParentsEncPathes(resource);
229-
model.put("parentsEncPathes", parentsEncPathes);
230+
model.put("parentsEncPathes", parentsEncPathes);
230231
return model;
231232
}
232-
233+
233234
@RequestMapping("ABOUT")
234235
public ModelAndView renderAboutView(RenderRequest request, RenderResponse response) throws Exception {
235236
this.init(request);
236237
ModelMap model = new ModelMap();
237238
return new ModelAndView("about-portlet", model);
238239
}
239-
240+
240241
@RequestMapping("HELP")
241242
public ModelAndView renderHelpView(RenderRequest request, RenderResponse response) throws Exception {
242243
this.init(request);

0 commit comments

Comments
 (0)