Tal Nisan has uploaded a new change for review.
Change subject: findbugs: Fix fingbugs errors in CommonModel class
......................................................................
findbugs: Fix fingbugs errors in CommonModel class
Change-Id: I5c70235fe828c1d662813773312c6529101e0a2b
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/SearchPanelPresenterWidget.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java
3 files changed, 40 insertions(+), 36 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/14469/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
index 1f5c7d4..f3a7f12 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
@@ -52,7 +52,7 @@
public class CommonModel extends ListModel
{
- public static EventDefinition SignedOutEventDefinition;
+ private final static EventDefinition signedOutEventDefinition;
private Event privateSignedOutEvent;
public Event getSignedOutEvent()
@@ -229,7 +229,7 @@
if (!StringHelper.stringsEqual(searchStringPrefix, value))
{
searchStringPrefix = value;
- SearchStringPrefixChanged();
+ searchStringPrefixChanged();
onPropertyChanged(new
PropertyChangedEventArgs("SearchStringPrefix")); //$NON-NLS-1$
}
}
@@ -267,7 +267,7 @@
if (!checkIfNewValue || !StringHelper.stringsEqual(searchString,
value))
{
searchString = value;
- SearchStringChanged();
+ searchStringChanged();
onPropertyChanged(new PropertyChangedEventArgs("SearchString"));
//$NON-NLS-1$
}
}
@@ -350,7 +350,7 @@
static
{
- SignedOutEventDefinition = new EventDefinition("SingedOut",
CommonModel.class); //$NON-NLS-1$
+ signedOutEventDefinition = new EventDefinition("SignedOut",
CommonModel.class); //$NON-NLS-1$
}
private static CommonModel instance = null;
@@ -366,7 +366,7 @@
private CommonModel()
{
- setSignedOutEvent(new Event(SignedOutEventDefinition));
+ setSignedOutEvent(new Event(signedOutEventDefinition));
UICommand tempVar = new UICommand("Search", this); //$NON-NLS-1$
tempVar.setIsDefault(true);
@@ -396,12 +396,12 @@
setTaskList(new TaskListModel());
getTaskList().getSearchCommand().Execute();
- InitItems();
+ initItems();
setLoggedInUser(Frontend.getLoggedInUser());
}
- private void UpdateHasSelectedTags()
+ private void updateHasSelectedTags()
{
ArrayList<TagModel> selectedTags =
getTagList().getSelectedItems() != null ? Linq.<TagModel>
cast(getTagList().getSelectedItems())
@@ -410,7 +410,7 @@
setHasSelectedTags(getSelectedItem() != null && selectedTags.size() >
0);
}
- private void TagListModel_SelectedItemsChanged(Object sender, EventArgs e)
+ private void tagListModelSelectedItemsChanged(Object sender, EventArgs e)
{
// Reset system tree to the root item.
getSystemTree().getSelectedItemChangedEvent().removeListener(this);
@@ -418,7 +418,7 @@
getSystemTree().getSelectedItemChangedEvent().addListener(this);
boolean hadSelectedTags = getHasSelectedTags();
- UpdateHasSelectedTags();
+ updateHasSelectedTags();
dataCenterList.setIsAvailable(!getHasSelectedTags());
clusterList.setIsAvailable(!getHasSelectedTags());
@@ -449,7 +449,7 @@
String search = ""; //$NON-NLS-1$
RefObject<String> tempRef_prefix = new RefObject<String>(prefix);
RefObject<String> tempRef_search = new RefObject<String>(search);
- SplitSearchString(getSelectedItem().getDefaultSearchString(),
tempRef_prefix, tempRef_search);
+ splitSearchString(getSelectedItem().getDefaultSearchString(),
tempRef_prefix, tempRef_search);
prefix = tempRef_prefix.argvalue;
search = tempRef_search.argvalue;
@@ -457,7 +457,7 @@
setSearchString(search);
getSearchCommand().Execute();
- SearchStringChanged();
+ searchStringChanged();
}
}
@@ -493,7 +493,7 @@
// Reset tags tree to the root item.
getTagList().getSelectedItemsChangedEvent().removeListener(this);
getTagList().getResetCommand().Execute();
- UpdateHasSelectedTags();
+ updateHasSelectedTags();
getTagList().getSelectedItemsChangedEvent().addListener(this);
SystemTreeItemModel model = (SystemTreeItemModel)
getSystemTree().getSelectedItem();
@@ -608,7 +608,7 @@
String search = ""; //$NON-NLS-1$
RefObject<String> tempRef_prefix = new RefObject<String>(prefix);
RefObject<String> tempRef_search = new RefObject<String>(search);
- SplitSearchString(getSelectedItem().getDefaultSearchString(),
tempRef_prefix, tempRef_search);
+ splitSearchString(getSelectedItem().getDefaultSearchString(),
tempRef_prefix, tempRef_search);
prefix = tempRef_prefix.argvalue;
search = tempRef_search.argvalue;
@@ -676,24 +676,24 @@
}
}
- private void SearchStringChanged()
+ private void searchStringChanged()
{
getBookmarkList().setSearchString(getEffectiveSearchString());
}
- private void SearchStringPrefixChanged()
+ private void searchStringPrefixChanged()
{
setHasSearchStringPrefix(!StringHelper.isNullOrEmpty(getSearchStringPrefix()));
getAutoCompleteModel().setPrefix(getSearchStringPrefix());
}
- private void ClearSearchString()
+ private void clearSearchString()
{
setSearchString(getHasSearchStringPrefix() ? "" :
getSelectedItem().getDefaultSearchString(), false); //$NON-NLS-1$
getSearchCommand().Execute();
}
- public void SignOut()
+ public void signOut()
{
// Stop search on all list models.
for (SearchableListModel listModel : getItems())
@@ -725,7 +725,7 @@
}
}
- public void Configure()
+ private void configure()
{
if (getWindow() != null)
{
@@ -745,7 +745,7 @@
model.getCommands().add(tempVar);
}
- public void Cancel()
+ private void cancel()
{
setWindow(null);
}
@@ -766,7 +766,7 @@
private SearchableListModel diskList;
private SearchableListModel networkList;
- private void InitItems()
+ private void initItems()
{
ObservableCollection<SearchableListModel> list = new
ObservableCollection<SearchableListModel>();
@@ -828,7 +828,7 @@
if (ev.matchesDefinition(SelectedItemsChangedEventDefinition) &&
sender == getTagList())
{
- TagListModel_SelectedItemsChanged(sender, args);
+ tagListModelSelectedItemsChanged(sender, args);
}
else if
(ev.matchesDefinition(BookmarkListModel.NavigatedEventDefinition) && sender ==
getBookmarkList())
{
@@ -881,7 +881,7 @@
String search = ""; //$NON-NLS-1$
RefObject<String> tempRef_prefix = new RefObject<String>(prefix);
RefObject<String> tempRef_search = new RefObject<String>(search);
- SplitSearchString(getSelectedItem().getDefaultSearchString(),
tempRef_prefix, tempRef_search);
+ splitSearchString(getSelectedItem().getDefaultSearchString(),
tempRef_prefix, tempRef_search);
prefix = tempRef_prefix.argvalue;
search = tempRef_search.argvalue;
@@ -898,10 +898,10 @@
}
}
- UpdateHasSelectedTags();
+ updateHasSelectedTags();
}
- public void Search()
+ public void search()
{
executingSearch = true;
@@ -944,30 +944,30 @@
if (command == getSearchCommand())
{
- Search();
+ search();
}
else if (command == getSignOutCommand())
{
- SignOut();
+ signOut();
}
else if (command == getConfigureCommand())
{
- Configure();
+ configure();
}
else if (command == getClearSearchStringCommand())
{
- ClearSearchString();
+ clearSearchString();
}
else if (StringHelper.stringsEqual(command.getName(), "Cancel"))
//$NON-NLS-1$
{
- Cancel();
+ cancel();
}
}
/**
* Splits a search string into two component, the prefix and a search
string itself.
*/
- private void SplitSearchString(String source, RefObject<String> prefix,
RefObject<String> search)
+ private void splitSearchString(String source, RefObject<String> prefix,
RefObject<String> search)
{
ArrayList<TagModel> tags = (ArrayList<TagModel>)
getTagList().getSelectedItems();
SystemTreeItemModel model = (SystemTreeItemModel)
getSystemTree().getSelectedItem();
@@ -983,17 +983,18 @@
String entityClause = array[0];
String searchClause = array[1];
- String tagsClause = ""; //$NON-NLS-1$
+ StringBuilder tagsClauseBuilder = new StringBuilder();
for (TagModel tag : tags)
{
- tagsClause += ("tag=" + tag.getName().getEntity());
//$NON-NLS-1$
+ tagsClauseBuilder.append("tag="); //$NON-NLS-1$
+ tagsClauseBuilder.append(tag.getName().getEntity());
if (tag != tags.get(tags.size() - 1))
{
- tagsClause += " or "; //$NON-NLS-1$
+ tagsClauseBuilder.append(" or "); //$NON-NLS-1$
}
}
- prefix.argvalue = entityClause + ": " + tagsClause; //$NON-NLS-1$
+ prefix.argvalue = entityClause + ": " +
tagsClauseBuilder.toString(); //$NON-NLS-1$
search.argvalue = regex.replace(searchClause, "").trim();
//$NON-NLS-1$
}
// Split for system tree.
@@ -1250,6 +1251,9 @@
}
}
break;
+ default:
+ // Unsupported model type, nothing to select on the tree so do
nothing
+ break;
}
prefix.argvalue = prefix.argvalue + " "; //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/SearchPanelPresenterWidget.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/SearchPanelPresenterWidget.java
index 5ea2dcb..aa205e1 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/SearchPanelPresenterWidget.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/SearchPanelPresenterWidget.java
@@ -149,7 +149,7 @@
void updateModelSearchString() {
commonModel.setSearchString(getView().getSearchString());
- commonModel.Search();
+ commonModel.search();
}
void updateViewSearchString() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java
index 953c6b6..bf18812 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java
@@ -67,7 +67,7 @@
@Override
public void onLogout() {
// Logout operation happens within the CommonModel SignOut event
handler
- CommonModelManager.instance().SignOut();
+ CommonModelManager.instance().signOut();
AsyncDataProvider.clearCache();
}
--
To view, visit http://gerrit.ovirt.org/14469
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c70235fe828c1d662813773312c6529101e0a2b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
