Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit df3a583

Browse files
committed
Use boolean flags instead of int
1 parent 1156d14 commit df3a583

File tree

7 files changed

+158
-158
lines changed

7 files changed

+158
-158
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public class GUISearchOptions implements Serializable {
7171

7272
private String topOperator;
7373

74-
private int caseSensitive = 1;
74+
private boolean caseSensitive = true;
7575

76-
private int retrieveAliases = 0;
76+
private boolean retrieveAliases = false;
7777

7878
private List<Long> filterIds = new ArrayList<>();
7979

@@ -302,27 +302,27 @@ public void setDepth(int depth) {
302302
this.depth = depth;
303303
}
304304

305-
public intgetCaseSensitive() {
306-
return caseSensitive;
305+
public SearchObservergetSource() {
306+
return source;
307307
}
308308

309-
public void setCaseSensitive(intcaseSensitive) {
310-
this.caseSensitive = caseSensitive;
309+
public void setSource(SearchObserversource) {
310+
this.source = source;
311311
}
312312

313-
public intgetRetrieveAliases() {
314-
return retrieveAliases;
313+
public booleanisCaseSensitive() {
314+
return caseSensitive;
315315
}
316316

317-
public void setRetrieveAliases(intretrieveAliases) {
318-
this.retrieveAliases = retrieveAliases;
317+
public void setCaseSensitive(booleancaseSensitive) {
318+
this.caseSensitive = caseSensitive;
319319
}
320320

321-
public SearchObservergetSource() {
322-
return source;
321+
public booleanisRetrieveAliases() {
322+
return retrieveAliases;
323323
}
324324

325-
public void setSource(SearchObserversource) {
326-
this.source = source;
327-
}
325+
public void setRetrieveAliases(booleanretrieveAliases) {
326+
this.retrieveAliases = retrieveAliases;
327+
}
328328
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderSearchForm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ protected GUISearchOptions prepareOptions() {
235235

236236
GUISearchOptions options = new GUISearchOptions();
237237
options.setMaxHits(Search.get().getMaxHits());
238-
options.setRetrieveAliases(Boolean.parseBoolean(vm.getValueAsString("aliases")) ? 1 : 0);
239-
options.setCaseSensitive(Boolean.parseBoolean(vm.getValueAsString(CASESENSITIVE)) ? 1 : 0);
238+
options.setRetrieveAliases(Boolean.parseBoolean(vm.getValueAsString("aliases")));
239+
options.setCaseSensitive(Boolean.parseBoolean(vm.getValueAsString(CASESENSITIVE)));
240240

241241
options.setType(GUISearchOptions.TYPE_FOLDERS);
242242

Lines changed: 129 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,130 @@
1-
package com.logicaldoc.gui.frontend.client.menu;
2-
3-
import java.util.Arrays;
4-
import java.util.LinkedHashMap;
5-
6-
import com.logicaldoc.gui.common.client.Constants;
7-
import com.logicaldoc.gui.common.client.Feature;
8-
import com.logicaldoc.gui.common.client.Session;
9-
import com.logicaldoc.gui.common.client.beans.GUICriterion;
10-
import com.logicaldoc.gui.common.client.beans.GUISearchOptions;
11-
import com.logicaldoc.gui.common.client.i18n.I18N;
12-
import com.logicaldoc.gui.common.client.util.AwesomeFactory;
13-
import com.logicaldoc.gui.frontend.client.document.grid.DocumentGridUtil;
14-
import com.logicaldoc.gui.frontend.client.search.Search;
15-
import com.smartgwt.client.types.Alignment;
16-
import com.smartgwt.client.widgets.form.fields.FormItemIcon;
17-
import com.smartgwt.client.widgets.form.fields.SelectItem;
18-
import com.smartgwt.client.widgets.form.fields.TextItem;
19-
20-
/**
21-
* A tray to interact with the Search
22-
*
23-
* @author Marco Meschieri - LogicalDOC
24-
* @since 8.9.4
25-
*/
26-
public class QuickSearchTray extends MenuTray {
27-
28-
private static final String SEARCH = "search";
29-
30-
private static final String FULLTEXT = "fulltext";
31-
32-
private TextItem searchBox = new TextItem();
33-
34-
private SelectItem searchType = new SelectItem();
35-
36-
public QuickSearchTray() {
37-
FormItemIcon search = new FormItemIcon();
38-
search.setInline(true);
39-
search.setInlineIconAlign(Alignment.RIGHT);
40-
search.setText(AwesomeFactory.getIconHtml(SEARCH));
41-
search.addFormItemClickHandler(event -> onSearch());
42-
43-
searchBox.setShowTitle(false);
44-
searchBox.setDefaultValue(I18N.message(SEARCH) + "...");
45-
searchBox.setWidth(180);
46-
searchBox.setIcons(search);
47-
searchBox.addKeyPressHandler(event -> {
48-
if (event.getKeyName() == null)
49-
return;
50-
if (Constants.KEY_ENTER.equalsIgnoreCase(event.getKeyName())) {
51-
onSearch();
52-
}
53-
});
54-
searchBox.addClickHandler(event -> {
55-
if ((I18N.message(SEARCH) + "...").equals(event.getItem().getValue())) {
56-
event.getItem().setValue("");
57-
}
58-
});
59-
60-
LinkedHashMap<String, String> valueMap = new LinkedHashMap<>();
61-
valueMap.put(FULLTEXT, I18N.message(FULLTEXT));
62-
valueMap.put("filename", I18N.message("filename"));
63-
valueMap.put("id", I18N.message("id"));
64-
valueMap.put("customId", I18N.message("customid"));
65-
66-
searchType.setWidth(130);
67-
searchType.setShowTitle(false);
68-
searchType.setValueMap(valueMap);
69-
searchType.setValue(FULLTEXT);
70-
71-
if (Feature.enabled(Feature.PARAMETRIC_SEARCHES))
72-
setItems(searchBox, searchType);
73-
else
74-
setItems(searchBox);
75-
}
76-
77-
private void onSearch() {
78-
GUISearchOptions options = new GUISearchOptions();
79-
80-
Integer pageSize = DocumentGridUtil.getPageSizeFromSpec(Session.get().getUser().getHitsGrid());
81-
if (pageSize == null)
82-
pageSize = Session.get().getConfigAsInt("search.hits");
83-
options.setMaxHits(pageSize);
84-
85-
String field = searchType.getValueAsString();
86-
String value = searchBox.getValueAsString().trim();
87-
if (FULLTEXT.equals(field)) {
88-
options.setType(GUISearchOptions.TYPE_FULLTEXT);
89-
options.setExpression(value);
90-
options.setExpressionLanguage(I18N.getLocale());
91-
options.setType(GUISearchOptions.TYPE_FULLTEXT);
92-
options.setFields(Constants.getFulltextDefaultFields());
93-
options.setCriteria(null);
94-
} else {
95-
options.setType(GUISearchOptions.TYPE_PARAMETRIC);
96-
options.setTopOperator("matchall");
97-
GUICriterion criterion = new GUICriterion();
98-
criterion.setField(field);
99-
criterion.setOperator("contains");
100-
if ("id".equals(field)) {
101-
criterion.setOperator("equals");
102-
try {
103-
criterion.setLongValue(Long.parseLong(value));
104-
} catch (Exception t) {
105-
criterion.setLongValue(0L);
106-
}
107-
} else
108-
criterion.setStringValue(value);
109-
options.setCaseSensitive(0);
110-
options.setCriteria(Arrays.asList(criterion));
111-
}
112-
113-
Search.get().setOptions(options);
114-
Search.get().search();
115-
}
116-
117-
118-
@Override
119-
public boolean equals(Object obj) {
120-
if (obj instanceof QuickSearchTray)
121-
return super.equals(obj);
122-
else
123-
return false;
124-
}
125-
126-
@Override
127-
public int hashCode() {
128-
return super.hashCode();
129-
}
1+
package com.logicaldoc.gui.frontend.client.menu;
2+
3+
import java.util.Arrays;
4+
import java.util.LinkedHashMap;
5+
6+
import com.logicaldoc.gui.common.client.Constants;
7+
import com.logicaldoc.gui.common.client.Feature;
8+
import com.logicaldoc.gui.common.client.Session;
9+
import com.logicaldoc.gui.common.client.beans.GUICriterion;
10+
import com.logicaldoc.gui.common.client.beans.GUISearchOptions;
11+
import com.logicaldoc.gui.common.client.i18n.I18N;
12+
import com.logicaldoc.gui.common.client.util.AwesomeFactory;
13+
import com.logicaldoc.gui.frontend.client.document.grid.DocumentGridUtil;
14+
import com.logicaldoc.gui.frontend.client.search.Search;
15+
import com.smartgwt.client.types.Alignment;
16+
import com.smartgwt.client.widgets.form.fields.FormItemIcon;
17+
import com.smartgwt.client.widgets.form.fields.SelectItem;
18+
import com.smartgwt.client.widgets.form.fields.TextItem;
19+
20+
/**
21+
* A tray to interact with the Search
22+
*
23+
* @author Marco Meschieri - LogicalDOC
24+
* @since 8.9.4
25+
*/
26+
public class QuickSearchTray extends MenuTray {
27+
28+
private static final String SEARCH = "search";
29+
30+
private static final String FULLTEXT = "fulltext";
31+
32+
private TextItem searchBox = new TextItem();
33+
34+
private SelectItem searchType = new SelectItem();
35+
36+
public QuickSearchTray() {
37+
FormItemIcon search = new FormItemIcon();
38+
search.setInline(true);
39+
search.setInlineIconAlign(Alignment.RIGHT);
40+
search.setText(AwesomeFactory.getIconHtml(SEARCH));
41+
search.addFormItemClickHandler(event -> onSearch());
42+
43+
searchBox.setShowTitle(false);
44+
searchBox.setDefaultValue(I18N.message(SEARCH) + "...");
45+
searchBox.setWidth(180);
46+
searchBox.setIcons(search);
47+
searchBox.addKeyPressHandler(event -> {
48+
if (event.getKeyName() == null)
49+
return;
50+
if (Constants.KEY_ENTER.equalsIgnoreCase(event.getKeyName())) {
51+
onSearch();
52+
}
53+
});
54+
searchBox.addClickHandler(event -> {
55+
if ((I18N.message(SEARCH) + "...").equals(event.getItem().getValue())) {
56+
event.getItem().setValue("");
57+
}
58+
});
59+
60+
LinkedHashMap<String, String> valueMap = new LinkedHashMap<>();
61+
valueMap.put(FULLTEXT, I18N.message(FULLTEXT));
62+
valueMap.put("filename", I18N.message("filename"));
63+
valueMap.put("id", I18N.message("id"));
64+
valueMap.put("customId", I18N.message("customid"));
65+
66+
searchType.setWidth(130);
67+
searchType.setShowTitle(false);
68+
searchType.setValueMap(valueMap);
69+
searchType.setValue(FULLTEXT);
70+
71+
if (Feature.enabled(Feature.PARAMETRIC_SEARCHES))
72+
setItems(searchBox, searchType);
73+
else
74+
setItems(searchBox);
75+
}
76+
77+
private void onSearch() {
78+
GUISearchOptions options = new GUISearchOptions();
79+
80+
Integer pageSize = DocumentGridUtil.getPageSizeFromSpec(Session.get().getUser().getHitsGrid());
81+
if (pageSize == null)
82+
pageSize = Session.get().getConfigAsInt("search.hits");
83+
options.setMaxHits(pageSize);
84+
85+
String field = searchType.getValueAsString();
86+
String value = searchBox.getValueAsString().trim();
87+
if (FULLTEXT.equals(field)) {
88+
options.setType(GUISearchOptions.TYPE_FULLTEXT);
89+
options.setExpression(value);
90+
options.setExpressionLanguage(I18N.getLocale());
91+
options.setType(GUISearchOptions.TYPE_FULLTEXT);
92+
options.setFields(Constants.getFulltextDefaultFields());
93+
options.setCriteria(null);
94+
} else {
95+
options.setType(GUISearchOptions.TYPE_PARAMETRIC);
96+
options.setTopOperator("matchall");
97+
GUICriterion criterion = new GUICriterion();
98+
criterion.setField(field);
99+
criterion.setOperator("contains");
100+
if ("id".equals(field)) {
101+
criterion.setOperator("equals");
102+
try {
103+
criterion.setLongValue(Long.parseLong(value));
104+
} catch (Exception t) {
105+
criterion.setLongValue(0L);
106+
}
107+
} else
108+
criterion.setStringValue(value);
109+
options.setCaseSensitive(false);
110+
options.setCriteria(Arrays.asList(criterion));
111+
}
112+
113+
Search.get().setOptions(options);
114+
Search.get().search();
115+
}
116+
117+
118+
@Override
119+
public boolean equals(Object obj) {
120+
if (obj instanceof QuickSearchTray)
121+
return super.equals(obj);
122+
else
123+
return false;
124+
}
125+
126+
@Override
127+
public int hashCode() {
128+
return super.hashCode();
129+
}
130130
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/FoldersForm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ protected void applyOptions(GUISearchOptions options) {
6767
folderSelector.setFolder(options.getFolder(), options.getFolderName());
6868

6969
vm.setValue("subfolders", options.isSearchInSubPath());
70-
vm.setValue("aliases", options.getRetrieveAliases() == 1);
70+
vm.setValue("aliases", options.isRetrieveAliases());
7171

72-
vm.setValue(CASESENSITIVE, options.getCaseSensitive() == 1);
72+
vm.setValue(CASESENSITIVE, options.isCaseSensitive());
7373
vm.setValue("match", options.getTopOperator());
7474

7575
conditionsLayout.removeMembers(conditionsLayout.getMembers());

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/FulltextForm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private void search() {
219219
options.setFolder(folder.getFolderId());
220220
options.setFolderName(folder.getFolderName());
221221

222-
options.setRetrieveAliases(Boolean.parseBoolean(vm.getValueAsString("aliases")) ? 1 : 0);
222+
options.setRetrieveAliases(Boolean.parseBoolean(vm.getValueAsString("aliases")));
223223

224224
setSubfolderCondition(options);
225225

@@ -363,7 +363,7 @@ private void applyOptions(GUISearchOptions options) {
363363

364364
vm.setValue(EXPRESSION_STR, options.getExpression());
365365
vm.setValue("subfolders", options.isSearchInSubPath());
366-
vm.setValue("aliases", options.getRetrieveAliases() == 1);
366+
vm.setValue("aliases", options.isRetrieveAliases());
367367
vm.setValue(LANGUAGE, options.getLanguage());
368368
if (options.getSizeMax() != null) {
369369
vm.setValue("size", options.getSizeMax() / 1024);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/ParametricForm.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ private void search() {
225225
options.setSource(this);
226226

227227
options.setMaxHits(Search.get().getMaxHits());
228-
options.setRetrieveAliases(Boolean.parseBoolean(vm.getValueAsString("aliases")) ? 1 : 0);
229-
options.setCaseSensitive(Boolean.parseBoolean(vm.getValueAsString(CASESENSITIVE)) ? 1 : 0);
228+
options.setRetrieveAliases(Boolean.parseBoolean(vm.getValueAsString("aliases")));
229+
options.setCaseSensitive(Boolean.parseBoolean(vm.getValueAsString(CASESENSITIVE)));
230230

231231
options.setType(GUISearchOptions.TYPE_PARAMETRIC);
232232

@@ -437,10 +437,10 @@ private void applyOptions(GUISearchOptions options) {
437437
folder.setFolder(options.getFolder(), options.getFolderName());
438438

439439
vm.setValue("subfolders", options.isSearchInSubPath());
440-
vm.setValue("aliases", options.getRetrieveAliases() == 1);
440+
vm.setValue("aliases", options.isRetrieveAliases());
441441
vm.setValue(LANGUAGE, options.getLanguage());
442442

443-
vm.setValue(CASESENSITIVE, options.getCaseSensitive() == 1);
443+
vm.setValue(CASESENSITIVE, options.isCaseSensitive());
444444
vm.setValue("match", options.getTopOperator());
445445

446446
conditionsLayout.removeMembers(conditionsLayout.getMembers());

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /