Skip to content

Commit 481a74f

Browse files
car031car031
committed
removed some code smells
1 parent 0b9b9a4 commit 481a74f

File tree

11 files changed

+44
-39
lines changed

11 files changed

+44
-39
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/PersistenceException.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.logicaldoc.core;
22

3+
import java.sql.SQLException;
4+
35
/**
46
* Raised when a problem happens in the data layer.
57
*
68
* @author Marco Meschieri - LogicalDOC
79
* @since 8.3.4
810
*/
9-
public class PersistenceException extends Exception {
11+
public class PersistenceException extends SQLException {
1012

1113
private static final long serialVersionUID = 1L;
1214

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ public static TimeItem newTimeItemPicklist(String name, String title) {
19681968

19691969
public static SelectItem newTemplateSelector(boolean withEmpty, Long selectedTemplateId) {
19701970
SelectItem templateItem = new SelectItem("template", I18N.message("template"));
1971-
templateItem.setDisplayField("label");
1971+
templateItem.setDisplayField(LABEL);
19721972
templateItem.setValueField("id");
19731973
templateItem.setWidth(150);
19741974
templateItem.setMultiple(false);
@@ -2040,7 +2040,7 @@ public static SelectItem newAttributeSetSelector() {
20402040
final SelectItem selectItem = new SelectItem("attributeset", I18N.message("attributeset"));
20412041
selectItem.setMultiple(false);
20422042
selectItem.setMultipleAppearance(MultipleAppearance.PICKLIST);
2043-
selectItem.setDisplayField("label");
2043+
selectItem.setDisplayField(LABEL);
20442044
selectItem.setValueField("id");
20452045
selectItem.setWidth(120);
20462046
selectItem.setOptionDataSource(new AttributeSetsDS(false, GUIAttributeSet.TYPE_DEFAULT));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ public static boolean isEmailFile(String fileName) {
516516
public static void copyText(String text) {
517517
writeToClipboard(text);
518518
GuiLog.info(I18N.message("texthascopied"));
519-
};
519+
}
520520

521521
/**
522522
* Writes a text into the client's clipboard

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/AttributeSetPropertiesPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ protected void addMetadata() {
553553
if (!attributeSet.isReadonly())
554554
name.addChangedHandler(changedHandler);
555555

556-
TextItem label = ItemFactory.newTextItem("label", attributeSet.getLabel());
556+
TextItem label = ItemFactory.newTextItem(LABEL, attributeSet.getLabel());
557557
label.setDisabled(attributeSet.isReadonly());
558558
if (!attributeSet.isReadonly())
559559
label.addChangedHandler(changedHandler);
@@ -576,7 +576,7 @@ protected boolean validate() {
576576
if (Boolean.FALSE.equals(vm.hasErrors())) {
577577
attributeSet.setName((String) values.get("name"));
578578
attributeSet.setDescription((String) values.get("description"));
579-
attributeSet.setLabel((String) values.get("label"));
579+
attributeSet.setLabel((String) values.get(LABEL));
580580
}
581581
return !vm.hasErrors();
582582
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/AttributeSetsPanel.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
*/
3636
public class AttributeSetsPanel extends VLayout {
3737

38+
private static final String LABEL = "label";
39+
3840
private static final String DESCRIPTION = "description";
3941

4042
protected Layout detailsContainer;
@@ -69,7 +71,7 @@ public void onDraw() {
6971
name.setCanFilter(true);
7072
name.setCanSort(true);
7173

72-
ListGridField label = new ListGridField("label", I18N.message("label"), 200);
74+
ListGridField label = new ListGridField(LABEL, I18N.message(LABEL), 200);
7375
label.setCanFilter(true);
7476
label.setCanSort(true);
7577

@@ -218,7 +220,7 @@ public void updateRecord(GUIAttributeSet set) {
218220

219221
rec.setAttribute("readonly", "" + set.isReadonly());
220222
rec.setAttribute("name", set.getName());
221-
rec.setAttribute("label", set.getLabel() != null ? set.getLabel() : set.getName());
223+
rec.setAttribute(LABEL, set.getLabel() != null ? set.getLabel() : set.getName());
222224
rec.setAttribute(DESCRIPTION, set.getDescription());
223225
list.refreshRow(list.getRecordIndex(rec));
224226

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/TemplatePropertiesPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ private void prepareTemplateForm() {
706706
TextAreaItem description = ItemFactory.newTextAreaItem("description", template.getDescription());
707707
description.setDisabled(template.isReadonly() || !template.isWrite());
708708

709-
TextItem label = ItemFactory.newTextItem("label", template.getLabel());
709+
TextItem label = ItemFactory.newTextItem(LABEL, template.getLabel());
710710
label.setDisabled(template.isReadonly() || !template.isWrite());
711711

712712
PickerIcon computeStat = new PickerIcon(PickerIconName.REFRESH, event -> {
@@ -751,7 +751,7 @@ protected boolean validate() {
751751
if (Boolean.FALSE.equals(vm.hasErrors())) {
752752
template.setName((String) values.get("name"));
753753
template.setDescription((String) values.get("description"));
754-
template.setLabel((String) values.get("label"));
754+
template.setLabel((String) values.get(LABEL));
755755
}
756756

757757
if (template.getId() != 0L) {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/TemplatesPanel.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
* @since 6.0
3535
*/
3636
public class TemplatesPanel extends VLayout {
37+
private static final String LABEL = "label";
38+
3739
private static final String DESCRIPTION = "description";
3840

3941
protected Layout detailsContainer;
@@ -73,7 +75,7 @@ public void onDraw() {
7375
name.setCanFilter(true);
7476
name.setCanSort(true);
7577

76-
ListGridField label = new ListGridField("label", I18N.message("label"), 200);
78+
ListGridField label = new ListGridField(LABEL, I18N.message(LABEL), 200);
7779
label.setCanFilter(true);
7880
label.setCanSort(true);
7981

@@ -219,7 +221,7 @@ public void updateRecord(GUITemplate template) {
219221

220222
rec.setAttribute("readonly", "" + template.isReadonly());
221223
rec.setAttribute("name", template.getName());
222-
rec.setAttribute("label", template.getLabel()!=null ? template.getLabel(): template.getName());
224+
rec.setAttribute(LABEL, template.getLabel()!=null ? template.getLabel(): template.getName());
223225
rec.setAttribute(DESCRIPTION, template.getDescription());
224226
list.refreshRow(list.getRecordIndex(rec));
225227
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/OCRHistoryPanel.java

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
*/
4040
public class OCRHistoryPanel extends VLayout {
4141

42+
private static final String EVENT = "event";
43+
4244
private static final String COMMENT = "comment";
4345

4446
private static final String DOC_ID = "docId";
@@ -56,7 +58,7 @@ private void refresh() {
5658
ColoredListGridField id = new ColoredListGridField("id");
5759
id.setHidden(true);
5860

59-
ListGridField eventLabel = new ListGridField("event", I18N.message("event"));
61+
ListGridField eventLabel = new ListGridField(EVENT, I18N.message(EVENT));
6062
eventLabel.setAlign(Alignment.CENTER);
6163
eventLabel.setAutoFitWidth(true);
6264
eventLabel.setCanFilter(true);
@@ -110,9 +112,8 @@ else if (val.toString().contains("ocr.failure"))
110112

111113
MenuItem openInFolder = new MenuItem();
112114
openInFolder.setTitle(I18N.message("openinfolder"));
113-
openInFolder.addClickHandler(evnt -> {
114-
DocumentsPanel.get().openInFolder(Long.parseLong(selectedRecord.getAttributeAsString(DOC_ID)));
115-
});
115+
openInFolder.addClickHandler(evnt -> DocumentsPanel.get()
116+
.openInFolder(Long.parseLong(selectedRecord.getAttributeAsString(DOC_ID))));
116117

117118
MenuItem preview = new MenuItem();
118119
preview.setTitle(I18N.message("preview"));
@@ -132,25 +133,22 @@ else if (val.toString().contains("ocr.failure"))
132133

133134
MenuItem downloadIndexed = new MenuItem();
134135
downloadIndexed.setTitle(I18N.message("downloadindexedtext"));
135-
downloadIndexed.addClickHandler(evnt -> {
136-
FolderService.Instance.get().getFolder(selectedRecord.getAttributeAsLong("folderId"), false, false,
137-
false, new AsyncCallback<GUIFolder>() {
138-
139-
@Override
140-
public void onFailure(Throwable caught) {
141-
GuiLog.serverError(caught);
142-
}
143-
144-
@Override
145-
public void onSuccess(GUIFolder folder) {
146-
if (folder.isDownload())
147-
Util.download(Util.downloadURL(selectedRecord.getAttributeAsLong(DOC_ID))
148-
+ "&downloadText=true");
149-
}
150-
});
151-
152-
});
153-
downloadIndexed.setEnabled(selectedRecord.getAttributeAsString("event").contains("ocr.success"));
136+
downloadIndexed.addClickHandler(evnt -> FolderService.Instance.get().getFolder(
137+
selectedRecord.getAttributeAsLong("folderId"), false, false, false, new AsyncCallback<GUIFolder>() {
138+
139+
@Override
140+
public void onFailure(Throwable caught) {
141+
GuiLog.serverError(caught);
142+
}
143+
144+
@Override
145+
public void onSuccess(GUIFolder folder) {
146+
if (folder.isDownload())
147+
Util.download(Util.downloadURL(selectedRecord.getAttributeAsLong(DOC_ID))
148+
+ "&downloadText=true");
149+
}
150+
}));
151+
downloadIndexed.setEnabled(selectedRecord.getAttributeAsString(EVENT).contains("ocr.success"));
154152

155153
contextMenu.setItems(preview, downloadIndexed, openInFolder);
156154
contextMenu.showContextMenu();

‎logicaldoc-util/src/main/java/com/logicaldoc/util/junit/AbstractTestCase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.Map;
1313
import java.util.Properties;
1414

15-
import javax.persistence.PersistenceException;
1615
import javax.sql.DataSource;
1716

1817
import org.hsqldb.cmdline.SqlFile;

‎logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/IndexingQueueDataServlet.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ protected void service(HttpServletRequest request, HttpServletResponse response,
5050
+ " ld_creation, ld_creator, ld_filesize, ld_immutable, ld_indexed, ld_lockuserid, ld_filename, ld_status,"
5151
+ " ld_signed, ld_type, ld_fileversion, ld_color from ld_document where " + where);
5252

53-
log.debug("Running filter query {}", query.toString());
53+
if(log.isDebugEnabled())
54+
log.debug("Running filter query {}", query);
5455

5556
/*
5657
* Execute the Query.
@@ -92,7 +93,8 @@ public Object[] mapRow(ResultSet rs, int row) throws SQLException {
9293
}
9394
}, max != null ? max : 100);
9495

95-
log.debug("Retrieved {} records", records.size());
96+
if(log.isDebugEnabled())
97+
log.debug("Retrieved {} records", records.size());
9698

9799
printDocuments(response, session, records);
98100
}

‎logicaldoc-webapp/src/main/java/com/logicaldoc/web/websockets/EventEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public static void distributeMessage(WebsocketMessage message) {
241241
}
242242
}
243243

244-
private synchronized static void sendMessageToPear(String event, String serializedMessage, Session peer) {
244+
private static synchronized void sendMessageToPear(String event, String serializedMessage, Session peer) {
245245
try {
246246
peer.getBasicRemote().sendText(serializedMessage);
247247
} catch (Exception e) {

0 commit comments

Comments
 (0)