jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

updated to POI 4.0.0

Browse Source
This commit is contained in:
Joern Muehlencord
2018-10-26 14:02:50 +02:00
parent 8c4f304d18
commit 4eb6bb77e2
4 changed files with 446 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
account/src/main/java/de/muehlencord/shared/account/presentation/LoginView.java
View File

@ -71,7 +71,7 @@ public class LoginView implements Serializable {
} else {
LOGGER.error(hint + " Reason: " + ex.toString());
}
FacesUtil.addErrorMessage("Login failed");
FacesUtil.addGlobalErrorMessage("Login failed", hint);
AccountEntity account = accountService.getAccountEntity(username, false);
if (account != null) {
@ -119,11 +119,11 @@ public class LoginView implements Serializable {
boolean passwordResetted = accountService.resetPassword(username, password, resetPasswordToken);
if (passwordResetted) {
// TODO add email notification on updated user account
FacesUtil.addInfoMessage("Password resetted");
FacesUtil.addGlobalInfoMessage("Password resetted", null);
return login();
} else {
// TODO add email notificaton on failed password reset
FacesUtil.addErrorMessage("Password reset failed");
FacesUtil.addGlobalErrorMessage("Password reset failed", null);
return login();
}
}

4
account/src/main/java/de/muehlencord/shared/account/presentation/LostPasswordView.java
View File

@ -26,9 +26,9 @@ public class LostPasswordView implements Serializable {
public String initPasswordReset() {
if (accountService.initPasswordReset(userName)) {
passwordResetStarted = true;
FacesUtil.addInfoMessage("Password reset started, please check your email account");
FacesUtil.addGlobalInfoMessage("Password reset started.", "Please check your email account.");
} else {
FacesUtil.addErrorMessage("Error while resetting password. Please contact your administrator");
FacesUtil.addGlobalErrorMessage("Error while resetting password.", "Please contact your administrator.");
}
return "/login.xhtml"; // TODO make configurable, get from LoginView?
}

2
poi-util/src/main/java/de/muehlencord/shared/poi/WorkbookApp.java
View File

@ -161,7 +161,7 @@ public class WorkbookApp {
newCell.setCellStyle(newCellStyle);
}
switch (oldCell.getCellTypeEnum()) {
switch (oldCell.getCellType()) {
case STRING:
newCell.setCellValue(oldCell.getStringCellValue());
break;

14
pom.xml
View File

@ -42,7 +42,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.21.0</version>
<version>2.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@ -84,7 +84,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>com.microsoft.ews-java-api</groupId>
@ -132,14 +132,14 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.0.10.Final</version>
<version>5.1.14.Final</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.11</version>
<version>2.0.12</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
@ -154,7 +154,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.2.17</version>
<version>2.2.18</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -166,7 +166,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.inversoft</groupId>