Skip to content

Commit c25151a

Browse files
car031car031
committed
Implemented last note
1 parent b72e247 commit c25151a

File tree

322 files changed

+1656
-4441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+1656
-4441
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/security/SessionManager.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,4 +728,29 @@ public void setApiKeyDao(ApiKeyDAO apiKeyDao) {
728728
public void setUserDao(UserDAO userDao) {
729729
this.userDao = userDao;
730730
}
731+
732+
@Override
733+
public int hashCode() {
734+
final int prime = 31;
735+
int result = super.hashCode();
736+
result = prime * result + ((listeners == null) ? 0 : listeners.hashCode());
737+
return result;
738+
}
739+
740+
@Override
741+
public boolean equals(Object obj) {
742+
if (this == obj)
743+
return true;
744+
if (!super.equals(obj))
745+
return false;
746+
if (getClass() != obj.getClass())
747+
return false;
748+
SessionManager other = (SessionManager) obj;
749+
if (listeners == null) {
750+
if (other.listeners != null)
751+
return false;
752+
} else if (!listeners.equals(other.listeners))
753+
return false;
754+
return true;
755+
}
731756
}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/GUIAsyncCallback.java renamed to logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/DefaultAsyncCallback.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,24 @@
55
import com.logicaldoc.gui.common.client.util.LD;
66

77
/**
8-
* An abstract implemantation of callback that logs the server errors
8+
* An implemantation of callback that logs the server errors and clears the
9+
* prompt
910
*
1011
* @author Marco Meschieri - LogicalDOC
1112
* @since 9.1.1
1213
*
1314
* @param <T>
1415
*/
15-
public abstract class GUIAsyncCallback<T> implements AsyncCallback<T> {
16+
public class DefaultAsyncCallback<T> implements AsyncCallback<T> {
1617

1718
@Override
1819
public void onFailure(Throwable caught) {
1920
LD.clearPrompt();
2021
GuiLog.serverError(caught);
2122
}
23+
24+
@Override
25+
public void onSuccess(T v) {
26+
LD.clearPrompt();
27+
}
2228
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/IgnoreAsyncCallback.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.logicaldoc.gui.common.client;
2+
3+
import com.google.gwt.user.client.rpc.AsyncCallback;
4+
5+
/**
6+
* An implemantation of callback that ignores both successes and failures
7+
*
8+
* @author Marco Meschieri - LogicalDOC
9+
* @since 9.1.1
10+
*
11+
* @param <T>
12+
*/
13+
public class IgnoreAsyncCallback<T> implements AsyncCallback<T> {
14+
15+
@Override
16+
public void onFailure(Throwable caught) {
17+
// Do nothing
18+
}
19+
20+
@Override
21+
public void onSuccess(T v) {
22+
// Do nothing
23+
}
24+
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/Session.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.logicaldoc.gui.common.client.controllers.DocumentObserver;
1616
import com.logicaldoc.gui.common.client.controllers.UserController;
1717
import com.logicaldoc.gui.common.client.i18n.I18N;
18-
import com.logicaldoc.gui.common.client.log.GuiLog;
1918
import com.logicaldoc.gui.common.client.services.InfoService;
2019
import com.logicaldoc.gui.common.client.services.SecurityService;
2120
import com.logicaldoc.gui.common.client.util.Util;
@@ -295,12 +294,7 @@ public void logout() {
295294
Session.get().close();
296295
Util.redirect(GWT.getHostPageBaseURL() + "saml/logout");
297296
} else {
298-
SecurityService.Instance.get().logout(new AsyncCallback<>() {
299-
public void onFailure(Throwable caught) {
300-
GuiLog.serverError(caught);
301-
SC.warn(caught.getMessage());
302-
}
303-
297+
SecurityService.Instance.get().logout(new DefaultAsyncCallback<>() {
304298
@Override
305299
public void onSuccess(Void result) {
306300
CookiesManager.removeSid();

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/VoidCallback.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/i18n/I18N.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ else if (key != null && bundle.containsKey(key.toLowerCase()))
5151
}
5252

5353
public static String message(String key) {
54-
return messageWithDefault(key, key);
54+
return messageWithDefault(key, key != null ? key : "");
5555
}
5656

5757
public static String message(String key, String val) {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/DocumentProtectionManager.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Map;
55

66
import com.logicaldoc.gui.common.client.Constants;
7-
import com.logicaldoc.gui.common.client.GUIAsyncCallback;
7+
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
88
import com.logicaldoc.gui.common.client.Session;
99
import com.logicaldoc.gui.common.client.beans.GUIDocument;
1010
import com.logicaldoc.gui.common.client.i18n.I18N;
@@ -37,7 +37,7 @@ public static boolean isUnprotected(long docId) {
3737
* gets unlocked
3838
*/
3939
public static void askForPassword(final Long docId, final DocumentProtectionHandler handler) {
40-
DocumentService.Instance.get().getById(docId, new GUIAsyncCallback<>() {
40+
DocumentService.Instance.get().getById(docId, new DefaultAsyncCallback<>() {
4141

4242
@Override
4343
public void onSuccess(final GUIDocument result) {
@@ -70,7 +70,7 @@ public void onSuccess(final GUIDocument result) {
7070

7171
private static void unsetPassword(final Long docId, final DocumentProtectionHandler handler,
7272
final GUIDocument result, final String password) {
73-
DocumentService.Instance.get().unsetPassword(result.getId(), password, new GUIAsyncCallback<>() {
73+
DocumentService.Instance.get().unsetPassword(result.getId(), password, new DefaultAsyncCallback<>() {
7474
@Override
7575
public void onSuccess(Void res) {
7676
saveProtectionPasswordAndNotify(docId, handler, result, password);
@@ -80,7 +80,7 @@ public void onSuccess(Void res) {
8080

8181
private static void unprotect(final Long docId, final DocumentProtectionHandler handler, final GUIDocument result,
8282
final String password) {
83-
DocumentService.Instance.get().unprotect(result.getId(), password, new GUIAsyncCallback<>() {
83+
DocumentService.Instance.get().unprotect(result.getId(), password, new DefaultAsyncCallback<>() {
8484
@Override
8585
public void onSuccess(Boolean granted) {
8686
if (Boolean.TRUE.equals(granted)) {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/ItemFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ public static TextItem newCronExpressionItem(String name, String title, String v
14051405
validate.setPrompt(I18N.message("validate"));
14061406
validate.setSrc("[SKIN]/check.svg");
14071407
validate.addFormItemClickHandler(click -> InfoService.Instance.get().getCronDescription(cron.getValueAsString(),
1408-
I18N.getLocale(), new AsyncCallback<String>() {
1408+
I18N.getLocale(), new AsyncCallback<>() {
14091409

14101410
@Override
14111411
public void onFailure(Throwable caught) {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/SecurityUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import com.logicaldoc.gui.common.client.GUIAsyncCallback;
5+
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
66
import com.logicaldoc.gui.common.client.beans.GUIAccessControlEntry;
77
import com.logicaldoc.gui.common.client.i18n.I18N;
88
import com.logicaldoc.gui.common.client.log.GuiLog;
@@ -33,7 +33,7 @@ public static void checkPermissionsAndRun(List<Long> docIds, String[] requiredPe
3333
if (docIds == null || docIds.isEmpty())
3434
return;
3535

36-
DocumentService.Instance.get().getAllowedPermissions(docIds, new GUIAsyncCallback<>() {
36+
DocumentService.Instance.get().getAllowedPermissions(docIds, new DefaultAsyncCallback<>() {
3737

3838
@Override
3939
public void onSuccess(GUIAccessControlEntry grantedPermissions) {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/websockets/WebSocketListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.google.gwt.user.client.rpc.SerializationStreamFactory;
1717
import com.google.gwt.user.client.rpc.SerializationStreamReader;
1818
import com.google.gwt.user.client.rpc.SerializationStreamWriter;
19-
import com.logicaldoc.gui.common.client.GUIAsyncCallback;
19+
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
2020
import com.logicaldoc.gui.common.client.Menu;
2121
import com.logicaldoc.gui.common.client.Session;
2222
import com.logicaldoc.gui.common.client.beans.GUIReadingRequest;
@@ -153,7 +153,7 @@ private void handleEvent(WebsocketMessage event) {
153153
} else if ("event.reading.requested".equals(event.getEvent())) {
154154
String recipient = event.getComment().substring(event.getComment().indexOf(':') + 1).trim();
155155
if (Session.get().getUser().getUsername().equals(recipient)) {
156-
ReadingRequestService.Instance.get().getUnconfimedReadings(new GUIAsyncCallback<>() {
156+
ReadingRequestService.Instance.get().getUnconfimedReadings(new DefaultAsyncCallback<>() {
157157

158158
@Override
159159
public void onSuccess(List<GUIReadingRequest> readings) {

0 commit comments

Comments
 (0)