//stateMgr.addStateListener(this);\r
}\r
\r
- /*\r
+\r
public void login(String un, String pw) {\r
- if (user.isAuthenticated() && user.getName().equals(un) && pz2.spClient.checkAuthentication(user)) {\r
+ if (user.isAuthenticated() && user.getName().equals(un) /* && pz2.spClient.checkAuthentication(user) */) {\r
logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");\r
} else {\r
logger.info("doing un/pw login");\r
user.setName(un);\r
user.setPassword(pw);\r
- login("dummy");\r
+ login("");\r
}\r
}\r
- */\r
+\r
\r
\r
@Override \r
return initDocUpload.getIncludeDebug();\r
}\r
\r
- // TODO: Remove when possible\r
+ // TODO: Remove when obsolete\r
public InitDocUpload getInitDocUpload () {\r
return initDocUpload;\r
}\r
\r
public CategoriesResponse getCategories () {\r
- ResponseDataObject response = pz2.doCommand("categories");\r
- if (response.hasApplicationError()) {\r
- logger.debug(response.getXml());\r
- return new CategoriesResponse();\r
- } else {\r
- try {\r
- return (CategoriesResponse) response;\r
- } catch (Exception e) {\r
- e.printStackTrace();\r
+ if (pz2.isServiceProxyService()) {\r
+ ResponseDataObject response = pz2.doCommand("categories");\r
+ if (response.hasApplicationError()) {\r
logger.debug(response.getXml());\r
return new CategoriesResponse();\r
+ } else {\r
+ try {\r
+ return (CategoriesResponse) response;\r
+ } catch (Exception e) {\r
+ e.printStackTrace();\r
+ logger.debug(response.getXml());\r
+ return new CategoriesResponse();\r
+ }\r
}\r
+ } else {\r
+ return new CategoriesResponse();\r
}\r
}\r
\r