You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/06/23 10:47:11 UTC
svn commit: r1604715 [5/7] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/
openmeetings-core/src/main/java/org/ap...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Mon Jun 23 08:47:06 2014
@@ -75,7 +75,7 @@ import org.slf4j.Logger;
public class LangPanel extends AdminPanel {
private static final Logger log = Red5LoggerFactory.getLogger(LangPanel.class, webAppRootKey);
- private static final long serialVersionUID = 5904180813198016592L;
+ private static final long serialVersionUID = 1L;
FieldLanguage language;
final WebMarkupContainer listContainer;
@@ -90,7 +90,6 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
- @SuppressWarnings("unchecked")
public LangPanel(String id) {
super(id);
// Create feedback panels
@@ -99,15 +98,14 @@ public class LangPanel extends AdminPane
language = langDao.getFieldLanguageById(1L);
Fieldlanguagesvalues flv = new Fieldlanguagesvalues();
- flv.setLanguage_id(language.getLanguage_id());
+ flv.setLanguage_id(language.getId());
final LabelsForm form = new LabelsForm("form", this, flv);
form.showNewRecord();
add(form);
- final SearchableDataView<Fieldvalues> dataView = new SearchableDataView<Fieldvalues>(
- "langList"
+ final SearchableDataView<Fieldvalues> dataView = new SearchableDataView<Fieldvalues>("langList"
, new SearchableDataProvider<Fieldvalues>(FieldValueDao.class) {
- private static final long serialVersionUID = -6822789354860988626L;
+ private static final long serialVersionUID = 1L;
@Override
protected FieldValueDao getDao() {
@@ -116,25 +114,25 @@ public class LangPanel extends AdminPane
@Override
public long size() {
- return search == null ? getDao().count() : getDao().count(language.getLanguage_id(), search);
+ return search == null ? getDao().count() : getDao().count(language.getId(), search);
}
public Iterator<? extends Fieldvalues> iterator(long first, long count) {
return (search == null && getSort() == null
- ? getDao().get(language.getLanguage_id(), (int)first, (int)count)
- : getDao().get(language.getLanguage_id(), search, (int)first, (int)count, getSortStr())).iterator();
+ ? getDao().get(language.getId(), (int)first, (int)count)
+ : getDao().get(language.getId(), search, (int)first, (int)count, getSortStr())).iterator();
}
}) {
- private static final long serialVersionUID = 8715559628755439596L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final Item<Fieldvalues> item) {
final Fieldvalues fv = item.getModelObject();
- item.add(new Label("lblId", "" + fv.getFieldvalues_id()));
+ item.add(new Label("lblId", "" + fv.getId()));
item.add(new Label("name", fv.getName()));
item.add(new Label("value", fv.getFieldlanguagesvalue() != null ? fv.getFieldlanguagesvalue().getValue() : null));
item.add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = -8069413566800571061L;
+ private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(fv.getFieldlanguagesvalue());
@@ -143,15 +141,15 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content"
- + (fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues().getFieldvalues_id()) ? " ui-state-active" : "")));
+ Long formFvId = form.getModelObject().getFieldvalues() == null ? null : form.getModelObject().getFieldvalues().getId();
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content" + (fv.getId().equals(formFvId) ? " ui-state-active" : "")));
}
};
listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = 5097048616003411362L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -160,17 +158,17 @@ public class LangPanel extends AdminPane
}
};
DataViewContainer<Fieldvalues> container = new DataViewContainer<Fieldvalues>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container)
- , new OmOrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container)
- , new OmOrderByBorder<Fieldvalues>("orderByValue", "value", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Fieldvalues>("orderById", "fieldvalues.id", container))
+ .addLink(new OmOrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container))
+ .addLink(new OmOrderByBorder<Fieldvalues>("orderByValue", "value", container));
+ add(container.getLinks());
add(navigator);
langForm = new LangForm("langForm", listContainer, this);
fileUploadField = new FileUploadField("fileInput");
langForm.add(fileUploadField);
langForm.add(new UploadProgressBar("progress", langForm, fileUploadField));
fileUploadField.add(new AjaxFormSubmitBehavior(langForm, "onchange") {
- private static final long serialVersionUID = 2160216679027859231L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
@@ -181,7 +179,7 @@ public class LangPanel extends AdminPane
return;
}
getBean(LanguageImport.class)
- .addLanguageByDocument(language.getLanguage_id(), download.getInputStream(), getUserId());
+ .addLanguageByDocument(language.getId(), download.getInputStream(), getUserId());
} catch (Exception e) {
log.error("Exception on panel language editor import ", e);
importFeedback.error(e);
@@ -201,9 +199,9 @@ public class LangPanel extends AdminPane
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- final List<Fieldlanguagesvalues> flvList = getBean(FieldLanguagesValuesDao.class).getMixedFieldValuesList(language.getLanguage_id());
+ final List<Fieldlanguagesvalues> flvList = getBean(FieldLanguagesValuesDao.class).getMixedFieldValuesList(language.getId());
- FieldLanguage fl = getBean(FieldLanguageDao.class).getFieldLanguageById(language.getLanguage_id());
+ FieldLanguage fl = getBean(FieldLanguageDao.class).getFieldLanguageById(language.getId());
if (fl != null && flvList != null) {
download.setFileName(fl.getName() + ".xml");
download.setResourceStream(new AbstractResourceStream() {
@@ -213,7 +211,7 @@ public class LangPanel extends AdminPane
public InputStream getInputStream() throws ResourceStreamNotFoundException {
try {
- Document doc = createDocument(flvList, getBean(FieldLanguagesValuesDao.class).getUntranslatedFieldValuesList(language.getLanguage_id()));
+ Document doc = createDocument(flvList, getBean(FieldLanguagesValuesDao.class).getUntranslatedFieldValuesList(language.getId()));
sw = new StringWriter();
LangExport.serializetoXML(sw, "UTF-8", doc);
is = new ByteArrayInputStream(sw.toString().getBytes());
@@ -261,7 +259,7 @@ public class LangPanel extends AdminPane
for (Fieldlanguagesvalues flv : flvList) {
Element eTemp = root.addElement("string")
- .addAttribute("id", flv.getFieldvalues().getFieldvalues_id().toString())
+ .addAttribute("id", flv.getFieldvalues().getId().toString())
.addAttribute("name", flv.getFieldvalues().getName());
Element value = eTemp.addElement("value");
value.addText(flv.getValue());
@@ -272,7 +270,7 @@ public class LangPanel extends AdminPane
root.addComment("Untranslated strings");
for (Fieldlanguagesvalues flv : untranslatedList) {
Element eTemp = root.addElement("string")
- .addAttribute("id", flv.getFieldvalues().getFieldvalues_id().toString())
+ .addAttribute("id", flv.getFieldvalues().getId().toString())
.addAttribute("name", flv.getFieldvalues().getName());
Element value = eTemp.addElement("value");
value.addText(flv.getValue());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Mon Jun 23 08:47:06 2014
@@ -76,7 +76,7 @@ public class LdapForm extends AdminBaseF
Application.getBean(LdapConfigDao.class).update(getModelObject(),
WebSession.getUserId());
LdapConfig ldapConfig = Application.getBean(LdapConfigDao.class)
- .get(getModelObject().getLdapConfigId());
+ .get(getModelObject().getId());
this.setModelObject(ldapConfig);
hideNewRecord();
target.add(this);
@@ -94,9 +94,9 @@ public class LdapForm extends AdminBaseF
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
LdapConfig ldapConfig = this.getModelObject();
- if (ldapConfig.getLdapConfigId() <= 0) {
+ if (ldapConfig.getId() <= 0) {
ldapConfig = Application.getBean(LdapConfigDao.class).get(
- ldapConfig.getLdapConfigId());
+ ldapConfig.getId());
} else {
ldapConfig = new LdapConfig();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Mon Jun 23 08:47:06 2014
@@ -40,7 +40,7 @@ import org.apache.wicket.markup.repeater
*
*/
public class LdapsPanel extends AdminPanel {
- private static final long serialVersionUID = -1L;
+ private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private LdapForm form;
@@ -50,21 +50,20 @@ public class LdapsPanel extends AdminPan
target.appendJavaScript("omLdapPanelInit();");
}
- @SuppressWarnings("unchecked")
public LdapsPanel(String id) {
super(id);
SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"
, new SearchableDataProvider<LdapConfig>(LdapConfigDao.class)) {
- private static final long serialVersionUID = 8715559628755439596L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final Item<LdapConfig> item) {
final LdapConfig lc = item.getModelObject();
- item.add(new Label("ldapConfigId", "" + lc.getLdapConfigId()));
+ item.add(new Label("ldapConfigId", "" + lc.getId()));
item.add(new Label("name", "" + lc.getName()));
item.add(new Label("configFileName", "" + lc.getConfigFileName()));
item.add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = -8069413566800571061L;
+ private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(lc);
@@ -74,12 +73,12 @@ public class LdapsPanel extends AdminPan
}
});
item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (lc.getLdapConfigId() == form.getModelObject().getLdapConfigId() ? " ui-state-active" : "")));
+ + (lc.getId() == form.getModelObject().getId() ? " ui-state-active" : "")));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = -1L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -87,10 +86,10 @@ public class LdapsPanel extends AdminPan
}
};
DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container)
- , new OmOrderByBorder<LdapConfig>("orderByName", "name", container)
- , new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container))
+ .addLink(new OmOrderByBorder<LdapConfig>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
+ add(container.getLinks());
add(navigator);
form = new LdapForm("form", listContainer, new LdapConfig());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Mon Jun 23 08:47:06 2014
@@ -38,13 +38,12 @@ public class OAuthPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private OAuthForm form;
- @SuppressWarnings("unchecked")
public OAuthPanel(String id) {
super(id);
SearchableDataView<OAuthServer> dataView = new SearchableDataView<OAuthServer>("oauthServersList",
new SearchableDataProvider<OAuthServer>(OAuth2Dao.class)) {
- private static final long serialVersionUID = -7701640237947383416L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(Item<OAuthServer> item) {
@@ -53,7 +52,7 @@ public class OAuthPanel extends AdminPan
item.add(new Label("name", server.getName()));
item.add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = 7380727643346943181L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -79,9 +78,9 @@ public class OAuthPanel extends AdminPan
}
};
DataViewContainer<OAuthServer> container = new DataViewContainer<OAuthServer>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<OAuthServer>("orderById", "oauthServerId", container),
- new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<OAuthServer>("orderById", "oauthServerId", container))
+ .addLink(new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
+ add(container.getLinks());
add(navigator);
form = new OAuthForm("form", listContainer, new OAuthServer());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Mon Jun 23 08:47:06 2014
@@ -122,7 +122,7 @@ public class RoomForm extends AdminBaseF
ListMultipleChoice<RoomOrganisation> orgChoiceList = new ListMultipleChoice<RoomOrganisation>(
"roomOrganisations", orgRooms,
new ChoiceRenderer<RoomOrganisation>("organisation.name",
- "organisation.organisation_id"));
+ "organisation.id"));
orgChoiceList.setMaxRows(6);
add(orgChoiceList);
@@ -153,7 +153,7 @@ public class RoomForm extends AdminBaseF
// Users in this Room
clients = new ListView<Client>("clients", clientsInRoom) {
- private static final long serialVersionUID = 8542589945574690054L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final ListItem<Client> item) {
@@ -208,14 +208,14 @@ public class RoomForm extends AdminBaseF
boolean found = false;
if (u != null) {
for (RoomModerator rm : r.getModerators()) {
- if (rm.getUser().getUser_id().equals(u.getUser_id())) {
+ if (rm.getUser().getId().equals(u.getId())) {
found = true;
break;
}
}
if (!found) {
RoomModerator rm = new RoomModerator();
- rm.setRoomId(r.getRooms_id());
+ rm.setRoomId(r.getId());
rm.setUser(u);
r.getModerators().add(0, rm);
moderator2add.setObject(null);
@@ -235,7 +235,7 @@ public class RoomForm extends AdminBaseF
name.add(AttributeAppender.append("class", "newItem"));
}
item.add(new CheckBox("isSuperModerator", new PropertyModel<Boolean>(moderator, "isSuperModerator")))
- .add(new Label("userId", "" + moderator.getUser().getUser_id()))
+ .add(new Label("userId", "" + moderator.getUser().getId()))
.add(name)
.add(new Label("email", moderator.getUser().getAdresses().getEmail()))
.add(new WebMarkupContainer("delete").add(new AjaxEventBehavior("onclick"){
@@ -277,7 +277,7 @@ public class RoomForm extends AdminBaseF
}
void updateClients(AjaxRequestTarget target) {
- long roomId = (getModelObject().getRooms_id() != null ? getModelObject().getRooms_id() : 0);
+ long roomId = (getModelObject().getId() != null ? getModelObject().getId() : 0);
final List<Client> clientsInRoom = Application.getBean(ISessionManager.class).getClientListByRoom(roomId);
clients.setDefaultModelObject(clientsInRoom);
target.add(clientsContainer);
@@ -286,11 +286,11 @@ public class RoomForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
Room r = getModelObject();
- boolean newRoom = r.getRooms_id() == null;
+ boolean newRoom = r.getId() == null;
r = getBean(RoomDao.class).update(r, getUserId());
if (newRoom) {
for (RoomModerator rm : r.getModerators()) {
- rm.setRoomId(r.getRooms_id());
+ rm.setRoomId(r.getId());
}
// FIXME double update
getBean(RoomDao.class).update(getModelObject(), getUserId());
@@ -318,8 +318,8 @@ public class RoomForm extends AdminBaseF
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Room r = getModelObject();
- if (r.getRooms_id() != null) {
- r = getBean(RoomDao.class).get(r.getRooms_id());
+ if (r.getId() != null) {
+ r = getBean(RoomDao.class).get(r.getId());
} else {
r = new Room();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Mon Jun 23 08:47:06 2014
@@ -46,21 +46,20 @@ public class RoomsPanel extends AdminPan
target.appendJavaScript("omRoomPanelInit();");
}
- @SuppressWarnings("unchecked")
public RoomsPanel(String id) {
super(id);
SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableDataProvider<Room>(RoomDao.class)) {
- private static final long serialVersionUID = 8715559628755439596L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final Item<Room> item) {
Room room = item.getModelObject();
- final long roomId = room.getRooms_id();
- item.add(new Label("rooms_id", "" + room.getRooms_id()));
+ final long roomId = room.getId();
+ item.add(new Label("rooms_id", "" + room.getId()));
item.add(new Label("name", "" + room.getName()));
item.add(new Label("ispublic", "" + room.getIspublic()));
item.add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = -8069413566800571061L;
+ private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
form.hideNewRecord();
@@ -71,7 +70,7 @@ public class RoomsPanel extends AdminPan
}
});
item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (room.getRooms_id().equals(form.getModelObject().getRooms_id()) ? " ui-state-active" : "")));
+ + (room.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
}
};
@@ -85,10 +84,10 @@ public class RoomsPanel extends AdminPan
}
};
DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Room>("orderById", "rooms_id", container)
- , new OmOrderByBorder<Room>("orderByName", "name", container)
- , new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Room>("orderById", "rooms_id", container))
+ .addLink(new OmOrderByBorder<Room>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
+ add(container.getLinks());
add(navigator);
add(form = new RoomForm("form", listContainer, new Room()));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Mon Jun 23 08:47:06 2014
@@ -40,7 +40,7 @@ import org.apache.wicket.markup.repeater
*
*/
public class ServersPanel extends AdminPanel {
- private static final long serialVersionUID = -2197334608577346569L;
+ private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private ServerForm form;
@@ -50,12 +50,11 @@ public class ServersPanel extends AdminP
target.appendJavaScript("omServerPanelInit();");
}
- @SuppressWarnings("unchecked")
public ServersPanel(String id) {
super(id);
SearchableDataView<Server> dataView = new SearchableDataView<Server>("serverList",
new SearchableDataProvider<Server>(ServerDao.class)) {
- private static final long serialVersionUID = 8715559628755439596L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final Item<Server> item) {
@@ -64,7 +63,7 @@ public class ServersPanel extends AdminP
item.add(new Label("name", "" + server.getName()));
item.add(new Label("address", "" + server.getAddress()));
item.add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = -8069413566800571061L;
+ private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(server);
@@ -80,7 +79,7 @@ public class ServersPanel extends AdminP
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = 5097048616003411362L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -88,10 +87,10 @@ public class ServersPanel extends AdminP
}
};
DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Server>("orderById", "id", container)
- , new OmOrderByBorder<Server>("orderByName", "name", container)
- , new OmOrderByBorder<Server>("orderByAddress", "address", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Server>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<Server>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<Server>("orderByAddress", "address", container));
+ add(container.getLinks());
add(navigator);
form = new ServerForm("form", listContainer, new Server());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Mon Jun 23 08:47:06 2014
@@ -112,8 +112,8 @@ public class UserForm extends AdminBaseF
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
User user = getModelObject();
- if (user.getUser_id() != null) {
- user = getBean(UserDao.class).get(user.getUser_id());
+ if (user.getId() != null) {
+ user = getBean(UserDao.class).get(user.getId());
} else {
user = new User();
}
@@ -186,7 +186,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onValidate() {
- if(!getBean(UserDao.class).checkUserLogin(login.getConvertedInput(), getModelObject().getUser_id())) {
+ if(!getBean(UserDao.class).checkUserLogin(login.getConvertedInput(), getModelObject().getId())) {
error(WebSession.getString(105));
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Mon Jun 23 08:47:06 2014
@@ -43,7 +43,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
public class UsersPanel extends AdminPanel {
- private static final long serialVersionUID = -4463107742579790120L;
+ private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private final MessageDialog warning = new MessageDialog("warning", WebSession.getString(797), WebSession.getString(343), DialogButtons.OK, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@@ -60,23 +60,22 @@ public class UsersPanel extends AdminPan
private UserForm form;
- @SuppressWarnings("unchecked")
public UsersPanel(String id) {
super(id);
final SearchableDataView<User> dataView = new SearchableDataView<User>("userList", new SearchableDataProvider<User>(UserDao.class)) {
- private static final long serialVersionUID = 8715559628755439596L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(Item<User> item) {
User u = item.getModelObject();
- final long userId = u.getUser_id();
- item.add(new Label("userId", "" + u.getUser_id()));
+ final long userId = u.getId();
+ item.add(new Label("userId", "" + u.getId()));
item.add(new Label("login", u.getLogin()));
item.add(new Label("firstName", u.getFirstname()));
item.add(new Label("lastName", u.getLastname()));
item.add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = -8069413566800571061L;
+ private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(getBean(UserDao.class).get(userId));
@@ -87,12 +86,12 @@ public class UsersPanel extends AdminPan
}
});
item.add(AttributeModifier.append("class", "clickable ui-widget-content"
- + (u.getUser_id().equals(form.getModelObject().getUser_id()) ? " ui-state-active" : "")));
+ + (u.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = 5097048616003411362L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -100,11 +99,11 @@ public class UsersPanel extends AdminPan
}
};
DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<User>("orderById", "user_id", container)
- , new OmOrderByBorder<User>("orderByLogin", "login", container)
- , new OmOrderByBorder<User>("orderByFirstName", "firstname", container)
- , new OmOrderByBorder<User>("orderByLastName", "lastname", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<User>("orderById", "user_id", container))
+ .addLink(new OmOrderByBorder<User>("orderByLogin", "login", container))
+ .addLink(new OmOrderByBorder<User>("orderByFirstName", "firstname", container))
+ .addLink(new OmOrderByBorder<User>("orderByLastName", "lastname", container));
+ add(container.getLinks());
add(navigator);
UserDao usersDaoImpl = getBean(UserDao.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Mon Jun 23 08:47:06 2014
@@ -353,7 +353,7 @@ public class Application extends Authent
link += "&language=" + i.getInvitee().getLanguage_id().toString();
}
} else {
- link = getRoomUrlFragment(i.getRoom().getRooms_id()).getLink();
+ link = getRoomUrlFragment(i.getRoom().getId()).getLink();
}
}
return link;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/MessageResolver.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/MessageResolver.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/MessageResolver.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/MessageResolver.java Mon Jun 23 08:47:06 2014
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.parser.f
import org.apache.wicket.markup.resolver.WicketMessageResolver;
public class MessageResolver extends WicketMessageResolver {
- private static final long serialVersionUID = -5755259669383826988L;
+ private static final long serialVersionUID = 1L;
private final static String TAG_NAME = "ommessage";
static {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Mon Jun 23 08:47:06 2014
@@ -82,7 +82,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.DashboardContext;
public class WebSession extends AbstractAuthenticatedWebSession implements IWebSession {
- private static final long serialVersionUID = 1123393236459095315L;
+ private static final long serialVersionUID = 1L;
public static int MILLIS_IN_MINUTE = 60000;
//private static final Map<String, Locale> LNG_TO_LOCALE_MAP = new HashMap<String, Locale> ();
private long userId = -1;
@@ -220,7 +220,7 @@ public class WebSession extends Abstract
//soapLogin.setClientURL(clientURL); //FIXME
soapDao.update(soapLogin);
- sessionDao.updateUser(SID, user.getUser_id());
+ sessionDao.updateUser(SID, user.getId());
setUser(user);
recordingId = soapLogin.getRoomRecordingId();
return true;
@@ -231,7 +231,7 @@ public class WebSession extends Abstract
}
private void setUser(User u) {
- userId = u.getUser_id();
+ userId = u.getId();
rights = Collections.unmodifiableSet(u.getRights());
languageId = u.getLanguage_id();
externalType = u.getExternalUserType();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java Mon Jun 23 08:47:06 2014
@@ -55,7 +55,7 @@ public abstract class AddFolderDialog ex
title.setLabel(Model.of(WebSession.getString(572)));
add(feedback.setOutputMarkupId(true));
add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
- private static final long serialVersionUID = -3612671587183668912L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java Mon Jun 23 08:47:06 2014
@@ -24,7 +24,7 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.markup.html.panel.Panel;
public abstract class BasePanel extends Panel {
- private static final long serialVersionUID = 8663740955529405678L;
+ private static final long serialVersionUID = 1L;
public BasePanel(String id) {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java Mon Jun 23 08:47:06 2014
@@ -29,7 +29,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
public class ComunityUserForm extends Form<User> {
- private static final long serialVersionUID = -4487619335283747717L;
+ private static final long serialVersionUID = 1L;
public ComunityUserForm(String id, IModel<User> model) {
super(id, model);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmCallListener.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmCallListener.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmCallListener.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmCallListener.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.wicket.ajax.attributes
import org.apache.wicket.core.util.string.JavaScriptUtils;
public class ConfirmCallListener extends AjaxCallListener {
- private static final long serialVersionUID = 7355235720213137963L;
+ private static final long serialVersionUID = 1L;
public ConfirmCallListener(long id) {
this(id, "");
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxLink.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxLink.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxLink.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxLink.java Mon Jun 23 08:47:06 2014
@@ -22,7 +22,7 @@ import org.apache.wicket.ajax.attributes
import org.apache.wicket.ajax.markup.html.AjaxLink;
public abstract class ConfirmableAjaxLink extends AjaxLink<Void> {
- private static final long serialVersionUID = 7301747891668537168L;
+ private static final long serialVersionUID = 1L;
private long confirmId;
public ConfirmableAjaxLink(String id, long confirmId) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java Mon Jun 23 08:47:06 2014
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.panel.FeedbackPanel;
public abstract class FormSaveRefreshPanel<T> extends BasePanel {
- private static final long serialVersionUID = 6133794730008996211L;
+ private static final long serialVersionUID = 1L;
protected final FeedbackPanel feedback;
public FormSaveRefreshPanel(String id, Form<T> form) {
@@ -36,7 +36,7 @@ public abstract class FormSaveRefreshPan
// add a save button that can be used to submit the form via ajax
add(new AjaxButton("ajax-save-button", form) {
- private static final long serialVersionUID = 839803820502260006L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
@@ -55,7 +55,7 @@ public abstract class FormSaveRefreshPan
// add a refresh button that can be used to submit the form via ajax
add(new AjaxButton("ajax-refresh-button", form) {
- private static final long serialVersionUID = 839803820502260006L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Mon Jun 23 08:47:06 2014
@@ -61,7 +61,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
public class GeneralUserForm extends Form<User> {
- private static final long serialVersionUID = 5360667099083510234L;
+ private static final long serialVersionUID = 1L;
private Salutation salutation;
private FieldLanguage lang;
private PasswordTextField passwordField;
@@ -84,7 +84,7 @@ public class GeneralUserForm extends For
, salutDao.getUserSalutations(getLanguage())
, new ChoiceRenderer<Salutation>("label.value", "salutations_id"))
.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID = -6748844721645465468L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -99,13 +99,13 @@ public class GeneralUserForm extends For
add(new DropDownChoice<FieldLanguage>("language"
, new PropertyModel<FieldLanguage>(this, "lang")
, langDao.getLanguages()
- , new ChoiceRenderer<FieldLanguage>("name", "language_id"))
+ , new ChoiceRenderer<FieldLanguage>("name", "id"))
.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID = 2072021284702632856L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
- GeneralUserForm.this.getModelObject().setLanguage_id(lang.getLanguage_id());
+ GeneralUserForm.this.getModelObject().setLanguage_id(lang.getId());
}
}));
@@ -147,13 +147,13 @@ public class GeneralUserForm extends For
}
ListMultipleChoice<Organisation_Users> orgChoiceList = new ListMultipleChoice<Organisation_Users>(
"organisation_users", orgUsers,
- new ChoiceRenderer<Organisation_Users>("organisation.name", "organisation.organisation_id"));
+ new ChoiceRenderer<Organisation_Users>("organisation.name", "organisation.id"));
add(orgChoiceList.setEnabled(isAdminForm));
}
@Override
protected void onValidate() {
- if(!getBean(UserDao.class).checkUserEMail(email.getConvertedInput(), getModelObject().getUser_id())) {
+ if(!getBean(UserDao.class).checkUserEMail(email.getConvertedInput(), getModelObject().getId())) {
error(WebSession.getString(1000));
}
super.onValidate();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java Mon Jun 23 08:47:06 2014
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.util.string.Strings;
public class HeaderPanel extends BasePanel {
- private static final long serialVersionUID = 9020842845946685193L;
+ private static final long serialVersionUID = 1L;
public HeaderPanel(String id, String appName) {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java Mon Jun 23 08:47:06 2014
@@ -31,7 +31,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.PropertyModel;
public abstract class PagedEntityListPanel extends BasePanel {
- private static final long serialVersionUID = -4280843184916302671L;
+ private static final long serialVersionUID = 1L;
private List<Integer> numbers = Arrays.asList(10, 25, 50, 75, 100, 200);
public PagedEntityListPanel(String id, final SearchableDataView<? extends IDataProviderEntity> dataView) {
@@ -52,7 +52,7 @@ public abstract class PagedEntityListPan
add(searchForm.setOutputMarkupId(true));
searchForm.add(new TextField<String>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
searchForm.add(new AjaxButton("search", searchForm) {
- private static final long serialVersionUID = -1659023337945692814L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java Mon Jun 23 08:47:06 2014
@@ -39,7 +39,7 @@ public abstract class PagingNavigatorPan
f.add(new OmPagingNavigator("navigator", dataView).setOutputMarkupId(true))
.add(new DropDownChoice<Integer>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID = -7754441983330112248L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java Mon Jun 23 08:47:06 2014
@@ -38,7 +38,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
public class ProfileImagePanel extends BasePanel {
- private static final long serialVersionUID = 1119719397241677937L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(ProfileImagePanel.class, webAppRootKey);
protected final WebMarkupContainer profile;
@@ -57,7 +57,7 @@ public class ProfileImagePanel extends B
profile.add(new Image("img", WebSession.getString(5L)).add(AttributeModifier.replace("src", uri)));
} else {
profile.add(new Image("img", new ByteArrayResource("image/jpeg") {
- private static final long serialVersionUID = 6039580072791941591L;
+ private static final long serialVersionUID = 1L;
@Override
protected ResourceResponse newResourceResponse(Attributes attributes) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java Mon Jun 23 08:47:06 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.common;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import java.util.List;
@@ -34,9 +35,12 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Bytes;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class UploadableProfileImagePanel extends ProfileImagePanel {
private static final long serialVersionUID = 1L;
+ private static final Logger log = Red5LoggerFactory.getLogger(UploadableProfileImagePanel.class, webAppRootKey);
private FileUploadField fileUploadField;
public UploadableProfileImagePanel(String id, final long userId) {
@@ -61,7 +65,7 @@ public class UploadableProfileImagePanel
}));
form.add(new UploadProgressBar("progress", form, fileUploadField));
fileUploadField.add(new AjaxFormSubmitBehavior(form, "onchange") {
- private static final long serialVersionUID = 2160216679027859231L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
@@ -72,11 +76,10 @@ public class UploadableProfileImagePanel
boolean asIs = sf.isAsIs();
try {
//FIXME need to work with InputStream !!!
- getBean(GenerateImage.class)
- .convertImageUserProfile(fu.writeToTempFile(), userId, asIs);
+ getBean(GenerateImage.class).convertImageUserProfile(fu.writeToTempFile(), userId, asIs);
} catch (Exception e) {
// TODO display error
- e.printStackTrace();
+ log.error("Error", e);
}
} else {
//TODO display error
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java Mon Jun 23 08:47:06 2014
@@ -32,7 +32,7 @@ import org.apache.wicket.authroles.autho
@AuthorizeInstantiation("Dashboard")
public abstract class UserPanel extends BasePanel {
- private static final long serialVersionUID = 8607846885689465360L;
+ private static final long serialVersionUID = 1L;
public UserPanel(String id) {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java Mon Jun 23 08:47:06 2014
@@ -19,6 +19,8 @@
package org.apache.openmeetings.web.data;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.web.admin.SearchableDataView;
@@ -26,11 +28,11 @@ import org.apache.openmeetings.web.commo
import org.apache.wicket.markup.html.WebMarkupContainer;
public class DataViewContainer<T extends IDataProviderEntity> implements Serializable {
- private static final long serialVersionUID = -1027478954223527890L;
+ private static final long serialVersionUID = 1L;
public WebMarkupContainer container;
public SearchableDataView<T> view;
public PagedEntityListPanel navigator;
- public OmOrderByBorder<T>[] orderLinks;
+ private List<OmOrderByBorder<T>> orderLinks = new ArrayList<OmOrderByBorder<T>>();
public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view, PagedEntityListPanel navigator) {
this.container = container;
@@ -38,8 +40,14 @@ public class DataViewContainer<T extends
this.navigator = navigator;
}
- //TODO refactor to remove warnings
- public void setLinks(OmOrderByBorder<T>... orderLinks) {
- this.orderLinks = orderLinks;
+ public DataViewContainer<T> addLink(OmOrderByBorder<T> link) {
+ orderLinks.add(link);
+ return this;
+ }
+
+ public OmOrderByBorder<T>[] getLinks() {
+ @SuppressWarnings("unchecked")
+ OmOrderByBorder<T>[] a = new OmOrderByBorder[0];
+ return orderLinks.toArray(a);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java Mon Jun 23 08:47:06 2014
@@ -24,7 +24,7 @@ import org.apache.wicket.extensions.ajax
import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.CssProvider;
public class OmOrderByBorder<T extends IDataProviderEntity> extends AjaxFallbackOrderByBorder<String> {
- private static final long serialVersionUID = -867341109912297431L;
+ private static final long serialVersionUID = 1L;
private DataViewContainer<T> container;
public OmOrderByBorder(final String id, final String property, DataViewContainer<T> container) {
@@ -40,11 +40,11 @@ public class OmOrderByBorder<T extends I
@Override
protected void onAjaxClick(AjaxRequestTarget target) {
target.add(container.container, container.navigator);
- target.add(container.orderLinks);
+ target.add(container.getLinks());
}
static class SortIconCssProvider extends CssProvider<String> {
- private static final long serialVersionUID = 60178231250586887L;
+ private static final long serialVersionUID = 1L;
public SortIconCssProvider() {
super("ui-icon ui-icon-carat-1-n sort-icon", "ui-icon ui-icon-carat-1-s sort-icon", "ui-icon ui-icon-carat-2-n-s sort-icon");
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java Mon Jun 23 08:47:06 2014
@@ -36,7 +36,7 @@ import org.apache.wicket.model.IModel;
* @param <T>
*/
public class SearchableDataProvider<T extends IDataProviderEntity> extends SortableDataProvider<T, String> {
- private static final long serialVersionUID = 4325721185888905204L;
+ private static final long serialVersionUID = 1L;
protected Class<? extends IDataProviderDao<T>> clazz;
protected String search = null;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java Mon Jun 23 08:47:06 2014
@@ -24,7 +24,7 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.web.app.WebSession;
public abstract class BaseInitedPage extends BasePage {
- private static final long serialVersionUID = 5716753033219700254L;
+ private static final long serialVersionUID = 1L;
@Override
protected String getApplicationName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.request.IRequestParameters;
public abstract class BaseNotInitedPage extends BasePage {
- private static final long serialVersionUID = 5716753033219700254L;
+ private static final long serialVersionUID = 1L;
private static final InstallationConfig installCfg = new InstallationConfig();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java Mon Jun 23 08:47:06 2014
@@ -36,7 +36,7 @@ import org.apache.wicket.util.string.Str
import org.wicketstuff.urlfragment.AsyncUrlFragmentAwarePage;
public abstract class BasePage extends AsyncUrlFragmentAwarePage {
- private static final long serialVersionUID = -6237917782433412496L;
+ private static final long serialVersionUID = 1L;
private final Map<String, String> options;
private final HeaderPanel header;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Mon Jun 23 08:47:06 2014
@@ -70,7 +70,7 @@ import org.wicketstuff.urlfragment.UrlFr
@AuthorizeInstantiation({"Admin", "Dashboard", "Room"})
public class MainPage extends BaseInitedPage {
- private static final long serialVersionUID = 6421960759218157999L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
private final MenuPanel menu;
private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks");
@@ -86,7 +86,7 @@ public class MainPage extends BaseInited
add(contents.add(new WebMarkupContainer(CHILD_ID)).setOutputMarkupId(true).setMarkupId("contents"));
add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
topLinks.add(new AjaxLink<Void>("messages") {
- private static final long serialVersionUID = 4065339709905366840L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -94,7 +94,7 @@ public class MainPage extends BaseInited
}
});
topLinks.add(new ConfirmableAjaxLink("logout", 634L) {
- private static final long serialVersionUID = -2994610981053570537L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -103,7 +103,7 @@ public class MainPage extends BaseInited
}
});
topLinks.add(new AjaxLink<Void>("profile") {
- private static final long serialVersionUID = 4065339709905366840L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -112,7 +112,7 @@ public class MainPage extends BaseInited
});
final AboutDialog about = new AboutDialog("aboutDialog");
topLinks.add(new AjaxLink<Void>("about") {
- private static final long serialVersionUID = 4065339709905366840L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -130,7 +130,7 @@ public class MainPage extends BaseInited
add(new ChatPanel("chatPanel"));
add(new WebSocketBehavior() {
- private static final long serialVersionUID = -3311970325911992958L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onConnect(ConnectedMessage message) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.wicket.RestartResponseException;
public class NotInitedPage extends BaseNotInitedPage {
- private static final long serialVersionUID = 5002281516467955607L;
+ private static final long serialVersionUID = 1L;
public NotInitedPage() {
if (InitializationContainer.initComplete) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class SwfPage extends BaseNotInitedPage {
- private static final long serialVersionUID = 6492618860620779445L;
+ private static final long serialVersionUID = 1L;
public SwfPage() {
this(new PageParameters());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Mon Jun 23 08:47:06 2014
@@ -59,7 +59,7 @@ import com.googlecode.wicket.jquery.ui.w
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
- private static final long serialVersionUID = 8494008571497363018L;
+ private static final long serialVersionUID = 1L;
private String sendLbl = WebSession.getString(317);
private DialogButton send = new DialogButton(sendLbl);
private DialogButton cancel = new DialogButton(WebSession.getString(122));
@@ -79,7 +79,7 @@ public class ForgetPasswordDialog extend
public ForgetPasswordDialog(String id) {
super(id, WebSession.getString(312));
add(form = new Form<String>("form") {
- private static final long serialVersionUID = 6340692639510268144L;
+ private static final long serialVersionUID = 1L;
private IModel<String> lblModel = Model.of(WebSession.getString(315));
private Label label = new Label("label", lblModel);
@@ -93,7 +93,7 @@ public class ForgetPasswordDialog extend
.add(new Radio<Type>("login", Model.of(Type.login)).setOutputMarkupId(true))
.setOutputMarkupId(true));
rg.add(new AjaxFormChoiceComponentUpdatingBehavior() {
- private static final long serialVersionUID = 5814272716387415523L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -103,7 +103,7 @@ public class ForgetPasswordDialog extend
}
});
add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
- private static final long serialVersionUID = 5257502637636428620L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Mon Jun 23 08:47:06 2014
@@ -66,7 +66,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
public class RegisterDialog extends AbstractFormDialog<String> {
- private static final long serialVersionUID = -8333305491376538792L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
private DialogButton cancelBtn = new DialogButton(WebSession.getString(122));
private String registerLbl = WebSession.getString(121);
@@ -199,7 +199,7 @@ public class RegisterDialog extends Abst
getBean(IUserManager.class).registerUserInit(UserDao.getDefaultRights(), login, password, lastName
, firstName, email, null /* age/birthday */, "" /* street */
, "" /* additionalname */, "" /* fax */, "" /* zip */, state.getState_id()
- , "" /* town */, lang.getLanguage_id(), true /* sendWelcomeMessage */
+ , "" /* town */, lang.getId(), true /* sendWelcomeMessage */
, Arrays.asList(getBean(ConfigurationDao.class).getConfValue("default_domain_id", Long.class, null)),
"" /* phone */, false, sendConfirmation, TimeZone.getTimeZone(tzModel.getObject()),
false /* forceTimeZoneCheck */, "" /* userOffers */, "" /* userSearchs */, false /* showContactData */,
@@ -212,7 +212,7 @@ public class RegisterDialog extends Abst
}
class RegisterForm extends StatelessForm<Void> {
- private static final long serialVersionUID = 1701373326213602431L;
+ private static final long serialVersionUID = 1L;
private PasswordTextField confirmPassword;
private PasswordTextField passwordField;
private RequiredTextField<String> emailField;
@@ -248,14 +248,14 @@ public class RegisterDialog extends Abst
emailField.add(RfcCompliantEmailAddressValidator.getInstance());
add(langField = new DropDownChoice<FieldLanguage>("lang", new PropertyModel<FieldLanguage>(
RegisterDialog.this, "lang"), getBean(FieldLanguageDao.class).getLanguages(),
- new ChoiceRenderer<FieldLanguage>("name", "language_id")));
+ new ChoiceRenderer<FieldLanguage>("name", "id")));
langField.setRequired(true).setLabel(Model.of(WebSession.getString(111)));
add(tzDropDown.setRequired(true).setLabel(Model.of(WebSession.getString(1143))));
add(stateField = new DropDownChoice<State>("state", new PropertyModel<State>(RegisterDialog.this, "state"),
getBean(StateDao.class).getStates(), new ChoiceRenderer<State>("name", "state_id")));
stateField.setRequired(true).setLabel(Model.of(WebSession.getString(120)));
add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected
- private static final long serialVersionUID = -3612671587183668912L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Mon Jun 23 08:47:06 2014
@@ -49,7 +49,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
public class ResetPasswordDialog extends AbstractFormDialog<String> {
- private static final long serialVersionUID = -523469331995677748L;
+ private static final long serialVersionUID = 1L;
private String resetLbl = WebSession.getString(327);
private DialogButton resetBtn = new DialogButton(resetLbl);
private Form<String> form;
@@ -62,7 +62,7 @@ public class ResetPasswordDialog extends
super(id, WebSession.getString(325));
this.user = user;
add(form = new Form<String>("form"){
- private static final long serialVersionUID = -4553809631029292229L;
+ private static final long serialVersionUID = 1L;
private TextField<String> login;
private PasswordTextField confirmPassword;
{
@@ -80,7 +80,7 @@ public class ResetPasswordDialog extends
confirmPassword.setRequired(true).add(minimumLength(getMinPasswdLength(cfgDao)));
add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
- private static final long serialVersionUID = 5257502637636428620L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
@@ -156,7 +156,7 @@ public class ResetPasswordDialog extends
@Override
protected void onSubmit(AjaxRequestTarget target) {
try {
- getBean(UserDao.class).update(user, password.getConvertedInput(), user.getUser_id());
+ getBean(UserDao.class).update(user, password.getConvertedInput(), user.getId());
} catch (Exception e) {
error(e.getMessage());
}
@@ -175,7 +175,7 @@ public class ResetPasswordDialog extends
protected void onInitialize() {
super.onInitialize();
add(new JQueryBehavior(JQueryWidget.getSelector(this), "dialog") {
- private static final long serialVersionUID = -8870674570404919597L;
+ private static final long serialVersionUID = 1L;
@Override
protected String $()
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Mon Jun 23 08:47:06 2014
@@ -73,7 +73,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class SignInDialog extends AbstractFormDialog<String> {
- private static final long serialVersionUID = 7746996016261051947L;
+ private static final long serialVersionUID = 1L;
private Form<String> form;
private DialogButton loginBtn = new DialogButton(WebSession.getString(112));
private String registerLbl = WebSession.getString(123);
@@ -104,7 +104,7 @@ public class SignInDialog extends Abstra
protected void onInitialize() {
super.onInitialize();
add(new JQueryBehavior(JQueryWidget.getSelector(this), "dialog") {
- private static final long serialVersionUID = -249782023133645704L;
+ private static final long serialVersionUID = 1L;
@Override
protected String $()
@@ -186,11 +186,11 @@ public class SignInDialog extends Abstra
}
OmAuthenticationStrategy strategy = getAuthenticationStrategy();
WebSession ws = WebSession.get();
- Type type = domain.getLdapConfigId() > 0 ? Type.ldap : Type.user;
- if (ws.signIn(login, password, type, domain.getLdapConfigId())) {
+ Type type = domain.getId() > 0 ? Type.ldap : Type.user;
+ if (ws.signIn(login, password, type, domain.getId())) {
setResponsePage(Application.get().getHomePage());
if (rememberMe) {
- strategy.save(login, password, type, domain.getLdapConfigId());
+ strategy.save(login, password, type, domain.getId());
} else {
strategy.remove();
}
@@ -208,7 +208,7 @@ public class SignInDialog extends Abstra
}
class SignInForm extends StatelessForm<String> {
- private static final long serialVersionUID = 4079939497154278822L;
+ private static final long serialVersionUID = 1L;
private PasswordTextField passField;
private RequiredTextField<String> loginField;
@@ -231,7 +231,7 @@ public class SignInDialog extends Abstra
, ldaps, new ChoiceRenderer<LdapConfig>("name", "ldapConfigId"))).setVisible(ldaps.size() > 1));
add(new CheckBox("rememberMe", new PropertyModel<Boolean>(SignInDialog.this, "rememberMe")).setOutputMarkupId(true));
add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
- private static final long serialVersionUID = -3612671587183668912L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
@@ -244,7 +244,7 @@ public class SignInDialog extends Abstra
}
});
add(new AjaxLink<Void>("forget") {
- private static final long serialVersionUID = -7497568829491287604L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -253,7 +253,7 @@ public class SignInDialog extends Abstra
}
});
add(new Link<Void>("netTest") {
- private static final long serialVersionUID = -9055312659797800331L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick() {
@@ -274,7 +274,7 @@ public class SignInDialog extends Abstra
!"".equals(item.getModelObject().getIconUrl()));
icon.add(new AttributeModifier("src", new AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 7257002837120721882L;
+ private static final long serialVersionUID = 1L;
@Override
public String getObject() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Mon Jun 23 08:47:06 2014
@@ -74,7 +74,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
public class SignInPage extends BaseInitedPage {
- private static final long serialVersionUID = -3843571657066167592L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(SignInPage.class, webAppRootKey);
private SignInDialog d;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Mon Jun 23 08:47:06 2014
@@ -394,7 +394,7 @@ public class InstallWizard extends Wizar
}
private static class SelectOption implements Serializable {
- private static final long serialVersionUID = 2559982745410615390L;
+ private static final long serialVersionUID = 1L;
private static SelectOption NO = new SelectOption("0", "No");
private static SelectOption NO_TEXT = new SelectOption("no", "No");
private static SelectOption YES = new SelectOption("1", "Yes");
@@ -410,7 +410,7 @@ public class InstallWizard extends Wizar
}
private abstract class WizardDropDown<T> extends DropDownChoice<T> {
- private static final long serialVersionUID = 8870736740532631296L;
+ private static final long serialVersionUID = 1L;
T option;
IModel<Object> propModel;
@@ -453,7 +453,7 @@ public class InstallWizard extends Wizar
}
private class SelectOptionDropDown extends WizardDropDown<SelectOption> {
- private static final long serialVersionUID = -1433015274371279328L;
+ private static final long serialVersionUID = 1L;
SelectOptionDropDown(String id) {
super(id);
@@ -470,7 +470,7 @@ public class InstallWizard extends Wizar
}
private final class YesNoDropDown extends SelectOptionDropDown {
- private static final long serialVersionUID = 578375825530725477L;
+ private static final long serialVersionUID = 1L;
YesNoDropDown(String id) {
super(id);
@@ -481,7 +481,7 @@ public class InstallWizard extends Wizar
}
private final class YesNoTextDropDown extends SelectOptionDropDown {
- private static final long serialVersionUID = 578375825530725477L;
+ private static final long serialVersionUID = 1L;
YesNoTextDropDown(String id) {
super(id);
@@ -492,7 +492,7 @@ public class InstallWizard extends Wizar
}
private final class LangDropDown extends SelectOptionDropDown {
- private static final long serialVersionUID = -2826765890538795285L;
+ private static final long serialVersionUID = 1L;
public LangDropDown(String id) throws Exception {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.protocol.http.request.WebClientInfo;
public class InstallWizardPage extends BaseNotInitedPage {
- private static final long serialVersionUID = -438388395397826138L;
+ private static final long serialVersionUID = 1L;
private InstallWizard wizard = null;
public InstallWizardPage() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@
</div>
</div>
<div class="room wb area">
- This is the room prototype
+ <div class="wb" wicket:id="whiteboard"></div>
</div>
</wicket:panel>
</html>