Sharad Mishra has uploaded a new change for review.
Change subject: core: Renamed bookmarks.java to Bookmarks.java
......................................................................
core: Renamed bookmarks.java to Bookmarks.java
Change-Id: I745cfd1a4e6184da098ee202a6134759fc62c52e
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkOperationCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/BookmarksOperationParameters.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmarks.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAOHibernateImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BookmarkDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/GeneralDbDAOTest.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkEventArgs.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkListItemCell.java
21 files changed, 103 insertions(+), 103 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/10049/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java
index 932aeaa..88e1c7f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
import org.ovirt.engine.core.common.action.BookmarksParametersBase;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -10,7 +10,7 @@
@CustomLogFields({ @CustomLogField("BookmarkName"),
@CustomLogField("BookmarkValue") })
public abstract class BookmarkCommandBase<T extends BookmarksParametersBase>
extends AdminOperationCommandBase<T> {
- private bookmarks mBookmark;
+ private Bookmarks mBookmark;
private String mBookmarkName;
public BookmarkCommandBase(T parameters) {
@@ -20,7 +20,7 @@
public BookmarkCommandBase() {
}
- protected bookmarks getBookmark() {
+ protected Bookmarks getBookmark() {
if (mBookmark == null) {
mBookmark = DbFacade.getInstance().getBookmarkDao()
.get(getBookmarkId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkOperationCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkOperationCommand.java
index f788610..1ac0bcc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkOperationCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkOperationCommand.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.core.bll;
import org.ovirt.engine.core.common.action.BookmarksOperationParameters;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
public abstract class BookmarkOperationCommand<T extends
BookmarksOperationParameters> extends BookmarkCommandBase<T> {
public BookmarkOperationCommand(T parameters) {
@@ -9,7 +9,7 @@
}
@Override
- protected bookmarks getBookmark() {
+ protected Bookmarks getBookmark() {
return getParameters().getBookmark();
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
index 7574280..7bc4dfc 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByIdQuery.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.queries.*;
import org.ovirt.engine.core.dal.dbbroker.*;
@@ -12,7 +12,7 @@
@Override
protected void executeQueryCommand() {
- bookmarks bookmark =
DbFacade.getInstance().getBookmarkDao().get(getParameters().getBookmarkId());
+ Bookmarks bookmark =
DbFacade.getInstance().getBookmarkDao().get(getParameters().getBookmarkId());
getQueryReturnValue().setReturnValue(bookmark);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
index 32a6092..c944c8c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetBookmarkByNameQuery.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.queries.*;
import org.ovirt.engine.core.dal.dbbroker.*;
@@ -12,7 +12,7 @@
@Override
protected void executeQueryCommand() {
GetBookmarkByNameParameters params = (GetBookmarkByNameParameters)
getParameters();
- bookmarks bookmark = DbFacade.getInstance().getBookmarkDao()
+ Bookmarks bookmark = DbFacade.getInstance().getBookmarkDao()
.getByName(params.getBookmarkName());
getQueryReturnValue().setReturnValue(bookmark);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
index 4dfae14..ab29bc4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java
@@ -2,7 +2,7 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.action.BookmarksOperationParameters;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -17,12 +17,12 @@
@Override
protected boolean canDoAction() {
boolean result = false;
- bookmarks updated = getBookmark();
+ Bookmarks updated = getBookmark();
if (updated == null) {
AddInvalidIdErrorMessages(VdcBllMessages.VAR__ACTION__UPDATE);
} else {
- bookmarks current = DbFacade.getInstance().getBookmarkDao()
+ Bookmarks current = DbFacade.getInstance().getBookmarkDao()
.getByName(updated.getbookmark_name());
if (!(current == null || current.getbookmark_id().equals(
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/BookmarksOperationParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/BookmarksOperationParameters.java
index be7221f..a673214 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/BookmarksOperationParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/BookmarksOperationParameters.java
@@ -6,14 +6,14 @@
public class BookmarksOperationParameters extends BookmarksParametersBase {
private static final long serialVersionUID = 904048653429089175L;
@Valid
- private bookmarks _bookmark;
+ private Bookmarks _bookmark;
- public BookmarksOperationParameters(bookmarks bookmark) {
+ public BookmarksOperationParameters(Bookmarks bookmark) {
super(bookmark.getbookmark_id());
_bookmark = bookmark;
}
- public bookmarks getBookmark() {
+ public Bookmarks getBookmark() {
return _bookmark;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmarks.java
similarity index 93%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmarks.java
index bb210ae..476de33 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmarks.java
@@ -21,7 +21,7 @@
@Entity
@Table(name = "bookmarks")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class bookmarks extends IVdcQueryable implements
INotifyPropertyChanged, Serializable {
+public class Bookmarks extends IVdcQueryable implements
INotifyPropertyChanged, Serializable {
private static final long serialVersionUID = 8177640907822845847L;
@Id
@@ -64,16 +64,16 @@
}
- public bookmarks() {
+ public Bookmarks() {
}
- public bookmarks(String bookmark_name, String bookmark_value) {
+ public Bookmarks(String bookmark_name, String bookmark_value) {
this.name = bookmark_name;
this.value = bookmark_value;
}
- public bookmarks(String bookmark_name, String bookmark_value, Guid
bookmark_id) {
+ public Bookmarks(String bookmark_name, String bookmark_value, Guid
bookmark_id) {
this.name = bookmark_name;
this.value = bookmark_value;
this.id = bookmark_id;
@@ -94,7 +94,7 @@
return false;
if (obj.getClass() != this.getClass())
return false;
- bookmarks that = (bookmarks) obj;
+ Bookmarks that = (Bookmarks) obj;
boolean result = this.id.equals(that.id);
result &= this.name.equals(that.name);
result &= this.value.equals(that.value);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAO.java
index 7a69055..b451a59 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAO.java
@@ -2,7 +2,7 @@
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -17,7 +17,7 @@
* @param id
* @return the bookmark
*/
- bookmarks get(Guid id);
+ Bookmarks get(Guid id);
/**
* Retrieves the bookmark with the supplied name.
@@ -26,28 +26,28 @@
* the bookmark name
* @return the bookmark, or <code>null</code> if no such bookmark is
present
*/
- bookmarks getByName(String name);
+ Bookmarks getByName(String name);
/**
* Returns all defined bookmarks.
*
* @return the collection of bookmarks
*/
- List<bookmarks> getAll();
+ List<Bookmarks> getAll();
/**
* Saves the bookmark.
*
* @param bookmark
*/
- void save(bookmarks bookmark);
+ void save(Bookmarks bookmark);
/**
* Updates the bookmark with changes.
*
* @param bookmark
*/
- void update(bookmarks bookmark);
+ void update(Bookmarks bookmark);
/**
* Removes the specified bookmark.
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAODbFacadeImpl.java
index 95f0fd1..4433814 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAODbFacadeImpl.java
@@ -5,7 +5,7 @@
import java.util.List;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.CustomMapSqlParameterSource;
@@ -17,10 +17,10 @@
*/
public class BookmarkDAODbFacadeImpl extends BaseDAODbFacade implements
BookmarkDAO {
private class BookmarkRowMapper implements
- ParameterizedRowMapper<bookmarks> {
+ ParameterizedRowMapper<Bookmarks> {
@Override
- public bookmarks mapRow(ResultSet rs, int rowNum) throws SQLException {
- bookmarks entity = new bookmarks();
+ public Bookmarks mapRow(ResultSet rs, int rowNum) throws SQLException {
+ Bookmarks entity = new Bookmarks();
entity.setbookmark_id(new Guid(rs
.getString("bookmark_id")));
entity.setbookmark_name(rs.getString("bookmark_name"));
@@ -31,7 +31,7 @@
private class BookmarkSqlParameterSource extends
CustomMapSqlParameterSource {
- public BookmarkSqlParameterSource(bookmarks bookmark) {
+ public BookmarkSqlParameterSource(Bookmarks bookmark) {
super(dialect);
addValue("bookmark_id", bookmark.getbookmark_id());
addValue("bookmark_name", bookmark.getbookmark_name());
@@ -54,14 +54,14 @@
}
@Override
- public bookmarks get(Guid id) {
+ public Bookmarks get(Guid id) {
MapSqlParameterSource parameterSource = new BookmarkSqlParameterSource(
id);
return getCallsHandler().executeRead("GetBookmarkBybookmark_id", new
BookmarkRowMapper(), parameterSource);
}
@Override
- public bookmarks getByName(String name) {
+ public Bookmarks getByName(String name) {
MapSqlParameterSource parameterSource = new BookmarkSqlParameterSource(
name);
return getCallsHandler().executeRead("GetBookmarkBybookmark_name", new
BookmarkRowMapper(), parameterSource);
@@ -69,14 +69,14 @@
@SuppressWarnings("unchecked")
@Override
- public List<bookmarks> getAll() {
+ public List<Bookmarks> getAll() {
MapSqlParameterSource parameterSource = new
BookmarkSqlParameterSource();
return getCallsHandler().executeReadList("GetAllFromBookmarks", new
BookmarkRowMapper(), parameterSource);
}
@Override
- public void save(bookmarks bookmark) {
+ public void save(Bookmarks bookmark) {
Guid id = bookmark.getbookmark_id();
if (Guid.isNullOrEmpty(id)) {
id = Guid.NewGuid();
@@ -89,7 +89,7 @@
}
@Override
- public void update(bookmarks bookmark) {
+ public void update(Bookmarks bookmark) {
MapSqlParameterSource parameterSource = new BookmarkSqlParameterSource(
bookmark);
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAOHibernateImpl.java
index 66d45a3..7cff562 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BookmarkDAOHibernateImpl.java
@@ -1,14 +1,14 @@
package org.ovirt.engine.core.dao;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.compat.Guid;
/**
* <code>BookmarkDAOHibernateImpl</code> provides an implementation of {@link
BookmarkDAO} that uses Hibernate for
* persistence.
*/
-public class BookmarkDAOHibernateImpl extends BaseDAOHibernateImpl<bookmarks,
Guid> implements BookmarkDAO {
+public class BookmarkDAOHibernateImpl extends BaseDAOHibernateImpl<Bookmarks,
Guid> implements BookmarkDAO {
public BookmarkDAOHibernateImpl() {
- super(bookmarks.class);
+ super(Bookmarks.class);
}
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
index 7fd81ff..5b17408 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
@@ -37,7 +37,7 @@
import org.ovirt.engine.core.common.businessentities.action_version_map;
import org.ovirt.engine.core.common.businessentities.ad_groups;
import org.ovirt.engine.core.common.businessentities.async_tasks;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.businessentities.event_map;
import org.ovirt.engine.core.common.businessentities.event_notification_hist;
import
org.ovirt.engine.core.common.businessentities.event_notification_methods;
@@ -199,7 +199,7 @@
.addAnnotatedClass(ad_groups.class)
.addAnnotatedClass(async_tasks.class)
.addAnnotatedClass(AuditLog.class)
- .addAnnotatedClass(bookmarks.class)
+ .addAnnotatedClass(Bookmarks.class)
.addAnnotatedClass(DbUser.class)
.addAnnotatedClass(DiskImage.class)
.addAnnotatedClass(DiskImageDynamic.class)
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BookmarkDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BookmarkDAOTest.java
index 1ab8162..236f59a 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BookmarkDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BookmarkDAOTest.java
@@ -8,7 +8,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -21,8 +21,8 @@
private static final int BOOKMARK_MAX_RANDOM_NUMBER = 10000;
private BookmarkDAO dao;
- private bookmarks new_bookmark;
- private bookmarks existing_bookmark;
+ private Bookmarks new_bookmark;
+ private Bookmarks existing_bookmark;
@Override
@Before
@@ -32,7 +32,7 @@
dao = prepareDAO(dbFacade.getBookmarkDao());
// create some test data
- new_bookmark = new bookmarks();
+ new_bookmark = new Bookmarks();
Random r = new Random(System.currentTimeMillis());
new_bookmark.setbookmark_name("newbookmarkname"+ (r.nextInt() %
BOOKMARK_MAX_RANDOM_NUMBER));
new_bookmark.setbookmark_value("newbookmarkvalue");
@@ -45,7 +45,7 @@
*/
@Test
public void testGetWithInvalidId() {
- bookmarks result = dao.get(Guid.NewGuid());
+ Bookmarks result = dao.get(Guid.NewGuid());
assertNull(result);
}
@@ -55,7 +55,7 @@
*/
@Test
public void testGet() {
- bookmarks result = dao.get(existing_bookmark.getbookmark_id());
+ Bookmarks result = dao.get(existing_bookmark.getbookmark_id());
assertNotNull(result);
assertEquals(existing_bookmark.getbookmark_id(),
@@ -67,7 +67,7 @@
*/
@Test
public void testGetByNameWithInvalidName() {
- bookmarks result = dao.getByName("thisnameisinvalid");
+ Bookmarks result = dao.getByName("thisnameisinvalid");
assertNull(result);
}
@@ -77,7 +77,7 @@
*/
@Test
public void testGetByName() {
- bookmarks result = dao.getByName(existing_bookmark.getbookmark_name());
+ Bookmarks result = dao.getByName(existing_bookmark.getbookmark_name());
assertNotNull(result);
assertEquals(existing_bookmark.getbookmark_name(),
@@ -89,7 +89,7 @@
*/
@Test
public void testGetAll() {
- List<bookmarks> result = dao.getAll();
+ List<Bookmarks> result = dao.getAll();
assertEquals(BOOKMARK_COUNT, result.size());
}
@@ -101,7 +101,7 @@
public void testSave() {
dao.save(new_bookmark);
- bookmarks result = dao.getByName(new_bookmark.getbookmark_name());
+ Bookmarks result = dao.getByName(new_bookmark.getbookmark_name());
assertNotNull(result);
}
@@ -116,7 +116,7 @@
dao.update(existing_bookmark);
- bookmarks result = dao.get(existing_bookmark.getbookmark_id());
+ Bookmarks result = dao.get(existing_bookmark.getbookmark_id());
assertNotNull(result);
assertEquals(existing_bookmark.getbookmark_name(),
@@ -130,7 +130,7 @@
public void testRemove() {
dao.remove(existing_bookmark.getbookmark_id());
- bookmarks result = dao.get(existing_bookmark.getbookmark_id());
+ Bookmarks result = dao.get(existing_bookmark.getbookmark_id());
assertNull(result);
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
index 5fdec68..5c33adc 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java
@@ -33,7 +33,7 @@
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.businessentities.permissions;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
@@ -433,7 +433,7 @@
@Test
public void testGetEntityNameByIdAndTypeForBookmark() {
- bookmarks bookmark = dbFacade.getBookmarkDao().get(BOOKMARK_ID);
+ Bookmarks bookmark = dbFacade.getBookmarkDao().get(BOOKMARK_ID);
assertNotNull(bookmark);
String name = bookmark.getbookmark_name();
assertTrue(name.equals(dbFacade.getEntityNameByIdAndType(BOOKMARK_ID,
VdcObjectType.Bookmarks)));
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/GeneralDbDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/GeneralDbDAOTest.java
index 580a88e..ebafa3c 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/GeneralDbDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/GeneralDbDAOTest.java
@@ -20,7 +20,7 @@
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.businessentities.Network;
import org.ovirt.engine.core.common.businessentities.Role;
import org.ovirt.engine.core.common.businessentities.storage_domain_static;
@@ -38,7 +38,7 @@
public void setUp() throws Exception {
super.setUp();
// Only classes that allow user input are checked.
- businessEntities.add(bookmarks.class);
+ businessEntities.add(Bookmarks.class);
businessEntities.add(DbUser.class);
businessEntities.add(LUNs.class);
businessEntities.add(NetworkInterface.class);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index 919a13a..4105783 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -15,7 +15,7 @@
<include name="common/businessentities/AdRefStatus.java" />
<include name="common/businessentities/AdUser.java" />
<include name="common/businessentities/AuditLog.java" />
- <include name="common/businessentities/bookmarks.java" />
+ <include name="common/businessentities/Bookmarks.java" />
<include name="common/businessentities/BaseDisk.java" />
<include name="common/businessentities/DiskLunMap.java" />
<include name="common/businessentities/DiskLunMapId.java" />
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
index 265f5b3..2aa8d17 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java
@@ -44,7 +44,7 @@
import org.ovirt.engine.core.common.businessentities.VmType;
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.businessentities.event_subscriber;
import org.ovirt.engine.core.common.businessentities.permissions;
import org.ovirt.engine.core.common.businessentities.storage_domains;
@@ -709,16 +709,16 @@
return VdcEventNotificationUtils.GetNotificationEvents();
}
- public static ArrayList<bookmarks> GetBookmarkList()
+ public static ArrayList<Bookmarks> GetBookmarkList()
{
VdcQueryReturnValue returnValue =
Frontend.RunQuery(VdcQueryType.GetAllBookmarks, new VdcQueryParametersBase());
if (returnValue != null && returnValue.getSucceeded() &&
returnValue.getReturnValue() != null)
{
- return (ArrayList<bookmarks>) returnValue.getReturnValue();
+ return (ArrayList<Bookmarks>) returnValue.getReturnValue();
}
- return new ArrayList<bookmarks>();
+ return new ArrayList<Bookmarks>();
}
public static ArrayList<VmInterfaceType> GetNicTypeList(VmOsType osType,
boolean hasDualmode)
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkEventArgs.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkEventArgs.java
index bda817e..39cc423 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkEventArgs.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkEventArgs.java
@@ -5,19 +5,19 @@
@SuppressWarnings("unused")
public final class BookmarkEventArgs extends EventArgs
{
- private org.ovirt.engine.core.common.businessentities.bookmarks
privateBookmark;
+ private org.ovirt.engine.core.common.businessentities.Bookmarks
privateBookmark;
- public org.ovirt.engine.core.common.businessentities.bookmarks
getBookmark()
+ public org.ovirt.engine.core.common.businessentities.Bookmarks
getBookmark()
{
return privateBookmark;
}
- private void
setBookmark(org.ovirt.engine.core.common.businessentities.bookmarks value)
+ private void
setBookmark(org.ovirt.engine.core.common.businessentities.Bookmarks value)
{
privateBookmark = value;
}
- public
BookmarkEventArgs(org.ovirt.engine.core.common.businessentities.bookmarks
bookmark)
+ public
BookmarkEventArgs(org.ovirt.engine.core.common.businessentities.Bookmarks
bookmark)
{
setBookmark(bookmark);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java
index 8f08e30..d092201 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.action.BookmarksParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -32,10 +32,10 @@
public class BookmarkListModel extends SearchableListModel
{
- private static class BookmarksComparator implements Comparator<bookmarks> {
+ private static class BookmarksComparator implements Comparator<Bookmarks> {
@Override
- public int compare(bookmarks o1, bookmarks o2) {
+ public int compare(Bookmarks o1, Bookmarks o2) {
String name1 = o1.getbookmark_name();
String name2 = o2.getbookmark_name();
if (name1 == null || name2 == null) {
@@ -128,7 +128,7 @@
public void OnSuccess(Object model, Object ReturnValue)
{
SearchableListModel bookmarkListModel = (BookmarkListModel)
model;
- List<bookmarks> resultList = (List<bookmarks>)
((VdcQueryReturnValue) ReturnValue).getReturnValue();
+ List<Bookmarks> resultList = (List<Bookmarks>)
((VdcQueryReturnValue) ReturnValue).getReturnValue();
Collections.sort(resultList, COMPARATOR);
bookmarkListModel.setItems(resultList);
}
@@ -160,8 +160,8 @@
ArrayList<String> list = new ArrayList<String>();
for (Object item : getSelectedItems())
{
- org.ovirt.engine.core.common.businessentities.bookmarks i =
- (org.ovirt.engine.core.common.businessentities.bookmarks)
item;
+ org.ovirt.engine.core.common.businessentities.Bookmarks i =
+ (org.ovirt.engine.core.common.businessentities.Bookmarks)
item;
list.add(i.getbookmark_name());
}
model.setItems(list);
@@ -179,7 +179,7 @@
public void OnRemove()
{
- bookmarks selectedBookmark = (bookmarks) getSelectedItem();
+ Bookmarks selectedBookmark = (Bookmarks) getSelectedItem();
BookmarksParametersBase parameters = new
BookmarksParametersBase(selectedBookmark.getbookmark_id());
IFrontendActionAsyncCallback async = new
IFrontendActionAsyncCallback() {
@@ -196,8 +196,8 @@
public void Edit()
{
- org.ovirt.engine.core.common.businessentities.bookmarks bookmark =
- (org.ovirt.engine.core.common.businessentities.bookmarks)
getSelectedItem();
+ org.ovirt.engine.core.common.businessentities.Bookmarks bookmark =
+ (org.ovirt.engine.core.common.businessentities.Bookmarks)
getSelectedItem();
if (getWindow() != null)
{
@@ -260,13 +260,13 @@
return;
}
- org.ovirt.engine.core.common.businessentities.bookmarks tempVar =
- new org.ovirt.engine.core.common.businessentities.bookmarks();
+ org.ovirt.engine.core.common.businessentities.Bookmarks tempVar =
+ new org.ovirt.engine.core.common.businessentities.Bookmarks();
tempVar.setbookmark_id(model.getIsNew() ? (Guid) NGuid.Empty
- : ((org.ovirt.engine.core.common.businessentities.bookmarks)
getSelectedItem()).getbookmark_id());
+ : ((org.ovirt.engine.core.common.businessentities.Bookmarks)
getSelectedItem()).getbookmark_id());
tempVar.setbookmark_name((String) model.getName().getEntity());
tempVar.setbookmark_value((String)
model.getSearchString().getEntity());
- org.ovirt.engine.core.common.businessentities.bookmarks bookmark =
tempVar;
+ org.ovirt.engine.core.common.businessentities.Bookmarks bookmark =
tempVar;
model.StartProgress(null);
@@ -310,7 +310,7 @@
if (getSelectedItem() != null)
{
getNavigatedEvent().raise(this,
- new
BookmarkEventArgs((org.ovirt.engine.core.common.businessentities.bookmarks)
getSelectedItem()));
+ new
BookmarkEventArgs((org.ovirt.engine.core.common.businessentities.Bookmarks)
getSelectedItem()));
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java
index ac12549..6d08a4f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/model/BookmarkModelProvider.java
@@ -4,7 +4,7 @@
import java.util.Arrays;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.core.compat.Event;
import org.ovirt.engine.core.compat.EventArgs;
import org.ovirt.engine.core.compat.IEventListener;
@@ -25,9 +25,9 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
-public class BookmarkModelProvider extends
DataBoundTabModelProvider<bookmarks, BookmarkListModel> {
+public class BookmarkModelProvider extends
DataBoundTabModelProvider<Bookmarks, BookmarkListModel> {
- private final SingleSelectionModel<bookmarks> selectionModel;
+ private final SingleSelectionModel<Bookmarks> selectionModel;
private final Provider<BookmarkPopupPresenterWidget> popupProvider;
private final Provider<RemoveConfirmationPopupPresenterWidget>
removeConfirmPopupProvider;
@@ -45,14 +45,14 @@
this.tagModelProvider = tagModelProvider;
// Create selection model
- selectionModel = new SingleSelectionModel<bookmarks>();
+ selectionModel = new SingleSelectionModel<Bookmarks>();
selectionModel.addSelectionChangeHandler(new Handler() {
@Override
public void onSelectionChange(SelectionChangeEvent event) {
- bookmarks selectedObject = selectionModel.getSelectedObject();
- List<bookmarks> selectedItems = selectedObject != null
- ? new
ArrayList<bookmarks>(Arrays.asList(selectedObject))
- : new ArrayList<bookmarks>();
+ Bookmarks selectedObject = selectionModel.getSelectedObject();
+ List<Bookmarks> selectedItems = selectedObject != null
+ ? new
ArrayList<Bookmarks>(Arrays.asList(selectedObject))
+ : new ArrayList<Bookmarks>();
BookmarkModelProvider.this.setSelectedItems(selectedItems);
}
});
@@ -91,7 +91,7 @@
}
@Override
- protected void updateDataProvider(List<bookmarks> items) {
+ protected void updateDataProvider(List<Bookmarks> items) {
super.updateDataProvider(items);
// Clear selection when updating data
@@ -103,12 +103,12 @@
return getCommonModel().getBookmarkList();
}
- public SingleSelectionModel<bookmarks> getSelectionModel() {
+ public SingleSelectionModel<Bookmarks> getSelectionModel() {
return selectionModel;
}
@Override
- public void addDataDisplay(HasData<bookmarks> display) {
+ public void addDataDisplay(HasData<Bookmarks> display) {
super.addDataDisplay(display);
display.setSelectionModel(selectionModel);
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
index 0b410ec..aeb445d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkList.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.ui.webadmin.widget.bookmark;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.widget.action.AbstractActionStackPanelItem;
import org.ovirt.engine.ui.common.widget.action.SimpleActionPanel;
@@ -23,7 +23,7 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.Range;
-public class BookmarkList extends
AbstractActionStackPanelItem<BookmarkModelProvider, bookmarks,
CellList<bookmarks>> {
+public class BookmarkList extends
AbstractActionStackPanelItem<BookmarkModelProvider, Bookmarks,
CellList<Bookmarks>> {
interface WidgetUiBinder extends UiBinder<Widget, BookmarkList> {
WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class);
@@ -48,10 +48,10 @@
}
@Override
- protected CellList<bookmarks>
createDataDisplayWidget(BookmarkModelProvider modelProvider) {
+ protected CellList<Bookmarks>
createDataDisplayWidget(BookmarkModelProvider modelProvider) {
ApplicationTemplates templates =
ClientGinjectorProvider.instance().getApplicationTemplates();
- CellList<bookmarks> display = new CellList<bookmarks>(new
BookmarkListItemCell(templates));
+ CellList<Bookmarks> display = new CellList<Bookmarks>(new
BookmarkListItemCell(templates));
display.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.BOUND_TO_SELECTION);
display.setKeyboardPagingPolicy(KeyboardPagingPolicy.INCREASE_RANGE);
@@ -61,27 +61,27 @@
}
@Override
- protected SimpleActionPanel<bookmarks>
createActionPanel(BookmarkModelProvider modelProvider) {
- return new SimpleActionPanel<bookmarks>(modelProvider,
modelProvider.getSelectionModel(),
+ protected SimpleActionPanel<Bookmarks>
createActionPanel(BookmarkModelProvider modelProvider) {
+ return new SimpleActionPanel<Bookmarks>(modelProvider,
modelProvider.getSelectionModel(),
ClientGinjectorProvider.instance().getEventBus());
}
private void addActionButtons(final BookmarkModelProvider modelProvider) {
- actionPanel.addActionButton(new
WebAdminButtonDefinition<bookmarks>(constants.newBookmark()) {
+ actionPanel.addActionButton(new
WebAdminButtonDefinition<Bookmarks>(constants.newBookmark()) {
@Override
protected UICommand resolveCommand() {
return modelProvider.getModel().getNewCommand();
}
});
- actionPanel.addActionButton(new
WebAdminButtonDefinition<bookmarks>(constants.editBookmark()) {
+ actionPanel.addActionButton(new
WebAdminButtonDefinition<Bookmarks>(constants.editBookmark()) {
@Override
protected UICommand resolveCommand() {
return modelProvider.getModel().getEditCommand();
}
});
- actionPanel.addActionButton(new
WebAdminButtonDefinition<bookmarks>(constants.removeBookmark()) {
+ actionPanel.addActionButton(new
WebAdminButtonDefinition<Bookmarks>(constants.removeBookmark()) {
@Override
protected UICommand resolveCommand() {
return modelProvider.getModel().getRemoveCommand();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkListItemCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkListItemCell.java
index 9e26551..f320693 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkListItemCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/bookmark/BookmarkListItemCell.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.ui.webadmin.widget.bookmark;
-import org.ovirt.engine.core.common.businessentities.bookmarks;
+import org.ovirt.engine.core.common.businessentities.Bookmarks;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.idhandler.HasElementId;
import org.ovirt.engine.ui.common.utils.ElementIdUtils;
@@ -11,7 +11,7 @@
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.DOM;
-public class BookmarkListItemCell extends AbstractCell<bookmarks> implements
HasElementId {
+public class BookmarkListItemCell extends AbstractCell<Bookmarks> implements
HasElementId {
interface ViewIdHandler extends ElementIdHandler<BookmarkListItemCell> {
ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
@@ -27,7 +27,7 @@
}
@Override
- public void render(Context context, bookmarks value, SafeHtmlBuilder sb) {
+ public void render(Context context, Bookmarks value, SafeHtmlBuilder sb) {
sb.append(templates.bookmarkItem(
ElementIdUtils.createElementId(elementId,
value.getbookmark_name()),
value.getbookmark_name()));
--
To view, visit http://gerrit.ovirt.org/10049
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I745cfd1a4e6184da098ee202a6134759fc62c52e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
