Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Mon Apr 4 10:49:25 2016 @@ -108,6 +108,7 @@ public class LangPanel extends AdminPane return getDao().count(language.getValue(), search); } + @Override public Iterator<? extends StringLabel> iterator(long first, long count) { return getDao().get(language.getValue(), search, (int)first, (int)count, getSort()).iterator(); } @@ -122,6 +123,7 @@ public class LangPanel extends AdminPane item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.setModelObject(fv); form.hideNewRecord(); @@ -182,6 +184,7 @@ public class LangPanel extends AdminPane langForm.add(new AjaxButton("export"){ private static final long serialVersionUID = 1L; + @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { final String name = LabelDao.getLabelFileName(language.getValue()); download.setFileName(name); @@ -189,6 +192,7 @@ public class LangPanel extends AdminPane private static final long serialVersionUID = 1L; private transient InputStream is; + @Override public InputStream getInputStream() throws ResourceStreamNotFoundException { try { is = Application.class.getResourceAsStream(name); @@ -198,6 +202,7 @@ public class LangPanel extends AdminPane } } + @Override public void close() throws IOException { if (is != null) { is.close();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Mon Apr 4 10:49:25 2016 @@ -66,6 +66,7 @@ public class LdapsPanel extends AdminPan item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.setModelObject(lc); form.hideNewRecord(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Mon Apr 4 10:49:25 2016 @@ -95,9 +95,11 @@ public class RoomForm extends AdminBaseF DROPDOWN_NUMBER_OF_PARTICIPANTS, // new ChoiceRenderer<Long>() { private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(Long id) { return id; } + @Override public String getIdValue(Long id, int index) { return "" + id; } @@ -143,7 +145,7 @@ public class RoomForm extends AdminBaseF public Collection<RoomGroup> toChoices(Collection<String> _ids) { List<Long> ids = new ArrayList<Long>(); for (String id : _ids) { - ids.add(Long.parseLong(id)); + ids.add(Long.valueOf(id)); } List<RoomGroup> list = new ArrayList<RoomGroup>(); for (Group o : getBean(GroupDao.class).get(ids)) { Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Mon Apr 4 10:49:25 2016 @@ -59,13 +59,14 @@ public class RoomsPanel extends AdminPan @Override protected void populateItem(final Item<Room> item) { Room room = item.getModelObject(); - final long roomId = room.getId(); + final Long roomId = room.getId(); item.add(new Label("id")); item.add(new Label("name")); item.add(new Label("ispublic")); item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.hideNewRecord(); form.setModelObject(getBean(RoomDao.class).get(roomId)); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Mon Apr 4 10:49:25 2016 @@ -66,6 +66,7 @@ public class ServersPanel extends AdminP item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.setModelObject(server); form.hideNewRecord(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Mon Apr 4 10:49:25 2016 @@ -242,10 +242,12 @@ public class UserForm extends AdminBaseF domainId.setChoiceRenderer(new ChoiceRenderer<Long>() { private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(Long object) { return values.get(object); } + @Override public String getIdValue(Long object, int index) { return "" + object; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Mon Apr 4 10:49:25 2016 @@ -71,7 +71,7 @@ public class UsersPanel extends AdminPan @Override protected void populateItem(Item<User> item) { User u = item.getModelObject(); - final long userId = u.getId(); + final Long userId = u.getId(); item.add(new Label("id")); item.add(new Label("login")); item.add(new Label("firstname")); @@ -79,6 +79,7 @@ public class UsersPanel extends AdminPan item.add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { form.setModelObject(getBean(UserDao.class).get(userId)); form.hideNewRecord(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Mon Apr 4 10:49:25 2016 @@ -460,6 +460,7 @@ public class Application extends Authent } } + @Override public <T> T getOmBean(Class<T> clazz) { //FIXME hack for email templates support (should be in separate module for now return Application.getBean(clazz); } @@ -468,6 +469,7 @@ public class Application extends Authent return PROFILE_MESSAGES.getLink(); } + @Override public String getOmContactsLink() { //FIXME hack for email templates support (should be in separate module for now return getContactsLink(); } @@ -488,7 +490,7 @@ public class Application extends Authent link += "?invitationHash=" + i.getHash(); if (u.getLanguageId() > 0) { - link += "&language=" + u.getLanguageId().toString(); + link += "&language=" + u.getLanguageId(); } } else { link = getRoomUrlFragment(r.getId()).getLink(); @@ -497,6 +499,7 @@ public class Application extends Authent return link; } + @Override public String getOmInvitationLink(String baseUrl, Invitation i) { //FIXME hack for email templates support (should be in separate module for now return getInvitationLink(baseUrl, i); } @@ -506,18 +509,22 @@ public class Application extends Authent return rc.getUrlRenderer().renderFullUrl(Url.parse(getBean(ConfigurationDao.class).getBaseUrl() + rc.urlFor(clazz, pp))); } + @Override public String urlForActivatePage(PageParameters pp) { //FIXME hack for email templates support (should be in separate module for now return urlForPage(ActivatePage.class, pp); } + @Override public String getOmString(long id) { return getString(id); } + @Override public String getOmString(long id, long languageId) { return getString(id, languageId); } + @Override public String getOmString(String key, long languageId) { return getString(key, languageId); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java Mon Apr 4 10:49:25 2016 @@ -42,20 +42,23 @@ public class LabelResourceLoader impleme STRING_LABEL_MAPPING.put("PagingNavigator.last", 371L); } + @Override public String loadStringResource(Class<?> clazz, String key, Locale locale, String style, String variation) { return getStringByPropertyKey(key); } + @Override public String loadStringResource(Component component, String key, Locale locale, String style, String variation) { return getStringByPropertyKey(key); } - private String getStringByPropertyKey(String key) { + private static String getStringByPropertyKey(String key) { Long labelId = STRING_LABEL_MAPPING.get(key); - if (labelId == null) + if (labelId == null) { return null; + } return Application.getString(labelId); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Mon Apr 4 10:49:25 2016 @@ -90,7 +90,7 @@ public class WebSession extends Abstract public static int MILLIS_IN_MINUTE = 60000; public static final String SECURE_HASH = "secureHash"; public static final String INVITATION_HASH = "invitationHash"; - private long userId = -1; + private Long userId = null; private Set<Right> rights = new HashSet<User.Right>(); //TODO renew somehow on user edit !!!! private long languageId = -1; //TODO renew somehow on user edit !!!! private String SID = null; @@ -118,7 +118,7 @@ public class WebSession extends Abstract public void invalidate() { removeOnlineUser(getClientByKeys(getUserId(), get().getId())); super.invalidate(); - userId = -1; + userId = null; rights = new HashSet<User.Right>(); SID = null; sdf = null; @@ -171,14 +171,14 @@ public class WebSession extends Abstract @Override public boolean isSignedIn() { - if (userId < 1) { + if (userId == null) { IAuthenticationStrategy strategy = getAuthenticationStrategy(); // get username and password from persistence store String[] data = strategy.load(); if (data != null && data.length > 3 && data[2] != null) { Long domainId = null; try { - domainId = Long.parseLong(data[3]); + domainId = Long.valueOf(data[3]); } catch (Exception e) { //no-op } @@ -189,7 +189,7 @@ public class WebSession extends Abstract } } } - return userId > -1; + return userId != null && userId.longValue() > 0; } public boolean signIn(String secureHash, boolean markUsed) { @@ -275,7 +275,7 @@ public class WebSession extends Abstract signIn(u); return true; } catch (OmException oe) { - loginError = oe.getCode() == null ? -1L : oe.getCode(); + loginError = oe.getCode() == null ? Long.valueOf(-1) : oe.getCode(); } return false; } @@ -298,6 +298,7 @@ public class WebSession extends Abstract return (WebSession)AbstractAuthenticatedWebSession.get(); } + @Override public void setLanguage(long languageId) { this.languageId = languageId; } @@ -337,7 +338,7 @@ public class WebSession extends Abstract return get().getValidatedSid(); } - public static long getUserId() { + public static Long getUserId() { checkIsInvalid(); return get().userId; } @@ -494,6 +495,7 @@ public class WebSession extends Abstract } } + @Override public long getOmLanguage() { return getLanguage(); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java Mon Apr 4 10:49:25 2016 @@ -37,6 +37,7 @@ public class ComunityUserForm extends Fo RadioGroup<Long> rg = new RadioGroup<Long>("community_settings", new IModel<Long>() { private static final long serialVersionUID = 1L; + @Override public Long getObject() { User u = ComunityUserForm.this.getModelObject(); if (u.isShowContactData()) { @@ -47,6 +48,7 @@ public class ComunityUserForm extends Fo return 3L; } + @Override public void setObject(Long choice) { User u = ComunityUserForm.this.getModelObject(); if (choice.equals(1L)) { @@ -61,6 +63,7 @@ public class ComunityUserForm extends Fo } } + @Override public void detach() { } }); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java Mon Apr 4 10:49:25 2016 @@ -53,12 +53,15 @@ public class UploadableProfileImagePanel private static final long serialVersionUID = 1L; //FIXME this need to be eliminated + @Override public void detach() { } + @Override public void setObject(List<FileUpload> object) { } + @Override public List<FileUpload> getObject() { return null; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Mon Apr 4 10:49:25 2016 @@ -125,6 +125,7 @@ public abstract class FileTreePanel exte sizes.add(new AjaxSelfUpdatingTimerBehavior(Duration.seconds(30)) { private static final long serialVersionUID = 1L; + @Override protected void onPostProcessTarget(AjaxRequestTarget target) { updateSizes(); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/MyRecordingTreeProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/MyRecordingTreeProvider.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/MyRecordingTreeProvider.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/MyRecordingTreeProvider.java Mon Apr 4 10:49:25 2016 @@ -32,6 +32,7 @@ import org.apache.openmeetings.web.app.A public class MyRecordingTreeProvider extends RecordingTreeProvider { private static final long serialVersionUID = 1L; + @Override public Iterator<? extends Recording> getRoots() { Recording r = new Recording(); r.setId(0L); @@ -41,6 +42,7 @@ public class MyRecordingTreeProvider ext return Arrays.asList(r).iterator(); } + @Override public Iterator<? extends Recording> getChildren(Recording node) { if (node.getId() == 0) { return getBean(RecordingDao.class).getRootByOwner(getUserId()).iterator(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java Mon Apr 4 10:49:25 2016 @@ -38,6 +38,7 @@ public class PublicRecordingTreeProvider this.name = name; } + @Override public Iterator<? extends Recording> getRoots() { Recording r = new Recording(); r.setId(groupId == null ? -1 : -groupId); @@ -49,6 +50,7 @@ public class PublicRecordingTreeProvider return Arrays.asList(r).iterator(); } + @Override public Iterator<? extends Recording> getChildren(Recording node) { if (node.getId() < 0) { return getBean(RecordingDao.class).getRootByPublic(groupId).iterator(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/RecordingTreeProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/RecordingTreeProvider.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/RecordingTreeProvider.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/RecordingTreeProvider.java Mon Apr 4 10:49:25 2016 @@ -32,21 +32,24 @@ import org.apache.wicket.model.Model; public abstract class RecordingTreeProvider implements ITreeProvider<Recording> { private static final long serialVersionUID = 1L; + @Override public void detach() { // TODO LDM should be used } + @Override public boolean hasChildren(Recording node) { return node.getId() <= 0 || Type.Folder == node.getType(); } + @Override public Iterator<? extends Recording> getChildren(Recording node) { return getBean(RecordingDao.class).getByParent(node.getId()).iterator(); } + @Override public IModel<Recording> model(Recording object) { // TODO LDM should be used return Model.of(object); } - } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java Mon Apr 4 10:49:25 2016 @@ -32,6 +32,7 @@ public class OmOrderByBorder<T extends I setOutputMarkupId(true); } + @Override protected void onSortChanged() { container.view.setCurrentPage(0); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java Mon Apr 4 10:49:25 2016 @@ -44,6 +44,7 @@ public class SearchableDataProvider<T ex this.clazz = c; } + @Override public void detach() { // does nothing } @@ -60,16 +61,19 @@ public class SearchableDataProvider<T ex return result; } + @Override public Iterator<? extends T> iterator(long first, long count) { return (search == null && getSort() == null ? getDao().get((int)first, (int)count) : getDao().get(search, (int)first, (int)count, getSortStr())).iterator(); } + @Override public long size() { return search == null ? getDao().count() : getDao().count(search); } + @Override public IModel<T> model(T object) { return new CompoundPropertyModel<T>(object); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Mon Apr 4 10:49:25 2016 @@ -207,7 +207,7 @@ public class ForgetPasswordDialog extend * @param appLink * @return */ - private Long resetUser(String email, String username, String appLink) { + private static Long resetUser(String email, String username, String appLink) { try { UserDao userDao = getBean(UserDao.class); log.debug("resetUser " + email); @@ -237,7 +237,7 @@ public class ForgetPasswordDialog extend return new Long(-2); } - private void sendHashByUser(User us, String appLink, UserDao userDao) throws Exception { + private static void sendHashByUser(User us, String appLink, UserDao userDao) throws Exception { log.debug("User: " + us.getLogin()); us.setResethash(UUID.randomUUID().toString()); userDao.update(us, -1L); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Mon Apr 4 10:49:25 2016 @@ -119,6 +119,7 @@ public class ResetPasswordDialog extends add(confirmReset); } + @Override public void onConfigure(JQueryBehavior behavior) { super.onConfigure(behavior); behavior.setOption("dialogClass", Options.asString("no-close")); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Mon Apr 4 10:49:25 2016 @@ -195,15 +195,18 @@ public class SignInPage extends BaseInit return result; } - private void prepareConnection(URLConnection connection) { + private static void prepareConnection(URLConnection connection) { if (!(connection instanceof HttpsURLConnection)) return; ConfigurationDao configurationDao = getBean(ConfigurationDao.class); Boolean ignoreBadSSL = configurationDao.getConfValue(CONFIG_IGNORE_BAD_SSL, String.class, "no").equals("yes"); if (!ignoreBadSSL) return; TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() { + @Override public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {} + @Override public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {} + @Override public X509Certificate[] getAcceptedIssuers() { return null; } @@ -216,6 +219,7 @@ public class SignInPage extends BaseInit ((HttpsURLConnection) connection).setSSLSocketFactory(sslSocketFactory); ((HttpsURLConnection) connection).setHostnameVerifier(new HostnameVerifier() { + @Override public boolean verify(String arg0, SSLSession arg1) { return true; } @@ -280,7 +284,7 @@ public class SignInPage extends BaseInit return result; } - private Map<String, String> parseCanonicalResponse(String response) { + private static Map<String, String> parseCanonicalResponse(String response) { String[] parts = response.split("&"); Map<String, String> result = new HashMap<String, String>(); for (String part: parts) { Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Mon Apr 4 10:49:25 2016 @@ -636,6 +636,7 @@ public class InstallWizard extends Abstr th = null; } + @Override public void run() { try { installer.loadAll(getModelObject(), true); @@ -693,9 +694,11 @@ public class InstallWizard extends Abstr setChoiceRenderer(new ChoiceRenderer<String>() { private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(String object) { return object.toString(); } + @Override public String getIdValue(String object, int index) { return object.toString(); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java Mon Apr 4 10:49:25 2016 @@ -134,7 +134,7 @@ public class StartSharingEventBehavior e download.initiate(target); } - private String getLabels(int ... ids) { + private static String getLabels(int ... ids) { StringBuilder result = new StringBuilder(); boolean delim = false; LabelDao labelDao = getBean(LabelDao.class); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Mon Apr 4 10:49:25 2016 @@ -171,7 +171,7 @@ public class PollResultsDialog extends A } } - private String removeMinified(String name_) { + private static String removeMinified(String name_) { String name = name_; int idxOfExtension = name.lastIndexOf('.'); if (idxOfExtension > -1) { @@ -200,13 +200,13 @@ public class PollResultsDialog extends A public void onClose(IPartialPageRequestHandler handler, DialogButton button) { } - private String[] getTicks(RoomPoll p) { + private static String[] getTicks(RoomPoll p) { return p != null && RoomPoll.Type.numeric == p.getType() ? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"} : new String[] {Application.getString(34), Application.getString(35)}; } - private Integer[] initValues(int size) { + private static Integer[] initValues(int size) { Integer[] values = new Integer[size]; for (int i = 0; i < size; ++i) { values[i] = 0; @@ -214,7 +214,7 @@ public class PollResultsDialog extends A return values; } - private Integer[] getValues(RoomPoll p) { + private static Integer[] getValues(RoomPoll p) { Integer[] values = initValues(p != null && RoomPoll.Type.numeric == p.getType() ? 10 : 2); if (p != null && RoomPoll.Type.numeric == p.getType()) { for (RoomPollAnswer a : p.getAnswers()) { @@ -228,7 +228,7 @@ public class PollResultsDialog extends A return values; } - private PieChart<Integer> pieChart(RoomPoll p) { + private static PieChart<Integer> pieChart(RoomPoll p) { PieChart<Integer> pieChart = new PieChart<Integer>(null); String[] ticks = getTicks(p); Integer[] values = getValues(p); @@ -251,7 +251,7 @@ public class PollResultsDialog extends A return pieChart; } - private BarChart<Integer> barChart(RoomPoll p) { + private static BarChart<Integer> barChart(RoomPoll p) { String[] ticks = getTicks(p); BarChart<Integer> barChart = new BarChart<Integer>(null); barChart.addValue(Arrays.asList(getValues(p))); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Mon Apr 4 10:49:25 2016 @@ -212,7 +212,7 @@ public class ChatPanel extends BasePanel response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("acceptMessage", acceptMessage, explicit(PARAM_ROOM_ID), explicit(PARAM_MSG_ID)), "acceptMessage"))); } - private void sendRoom(ChatMessage m, String msg) { + private static void sendRoom(ChatMessage m, String msg) { IWebSocketConnectionRegistry reg = WebSocketSettings.Holder.get(Application.get()).getConnectionRegistry(); for (Client c : getRoomUsers(m.getToRoom().getId())) { try { Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.java Mon Apr 4 10:49:25 2016 @@ -62,6 +62,7 @@ public class ChatToolbar extends Panel i } + @Override public void attachToEditor(Component editor) { toolbar.add(AttributeModifier.replace("data-target", JQueryWidget.getSelector(editor))); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java Mon Apr 4 10:49:25 2016 @@ -66,7 +66,7 @@ public class InviteUserToRoomDialog exte add(inviteMsg); } - private List<Room> getPrivateRooms(Long userId1, Long userId2, RoomDao roomDao) { + private static List<Room> getPrivateRooms(Long userId1, Long userId2, RoomDao roomDao) { List<Long> orgIds = new ArrayList<>(); List<Long> orgIds2 = new ArrayList<>(); UserDao userDao = getBean(UserDao.class); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java Mon Apr 4 10:49:25 2016 @@ -35,6 +35,7 @@ import com.googlecode.wicket.jquery.ui.c public class AppointmentModel extends CalendarModel implements ICalendarVisitor { private static final long serialVersionUID = 1L; + @Override public void visit(CalendarEvent event) { //every event can be customized } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Mon Apr 4 10:49:25 2016 @@ -81,7 +81,7 @@ public class CalendarPanel extends UserP refreshTimer.stop(handler); } - private AppointmentDao getDao() { + private static AppointmentDao getDao() { return getBean(AppointmentDao.class); } @@ -260,7 +260,7 @@ public class CalendarPanel extends UserP add(refreshTimer); } - private Appointment getDefault() { + private static Appointment getDefault() { Appointment a = new Appointment(); a.setReminder(Reminder.ical); //TODO: Make configurable a.setOwner(getBean(UserDao.class).get(getUserId())); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java Mon Apr 4 10:49:25 2016 @@ -43,6 +43,7 @@ public class MyRoomsWidget extends Abstr id = WIDGET_ID_MY_ROOMS; } + @Override public WidgetView createView(String viewId) { return new MyRoomsWidgetView(viewId, new Model<Widget>(this)); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java Mon Apr 4 10:49:25 2016 @@ -25,22 +25,27 @@ import ro.fortsoft.wicket.dashboard.Widg public class MyRoomsWidgetDescriptor implements WidgetDescriptor { private static final long serialVersionUID = 1L; + @Override public String getName() { return Application.getString(781L); } + @Override public String getProvider() { return "Apache Openmeetings"; } + @Override public String getDescription() { return Application.getString(782L); } + @Override public String getWidgetClassName() { return MyRoomsWidget.class.getName(); } + @Override public String getTypeName() { return "om.widget.myrooms"; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java Mon Apr 4 10:49:25 2016 @@ -43,6 +43,7 @@ public class RssWidget extends AbstractW id = WIDGET_ID_RSS; } + @Override public WidgetView createView(String viewId) { return new RssWidgetView(viewId, new Model<Widget>(this)); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java Mon Apr 4 10:49:25 2016 @@ -25,22 +25,27 @@ import ro.fortsoft.wicket.dashboard.Widg public class RssWidgetDescriptor implements WidgetDescriptor { private static final long serialVersionUID = 1L; + @Override public String getName() { return Application.getString(277L); } + @Override public String getProvider() { return "Apache Openmeetings"; } + @Override public String getDescription() { return Application.getString(277L); } + @Override public String getWidgetClassName() { return RssWidget.class.getName(); } + @Override public String getTypeName() { return "om.widget.rss"; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java Mon Apr 4 10:49:25 2016 @@ -67,11 +67,13 @@ public class RssWidgetView extends Widge this.url = url; } + @Override public void onRequest() { ResourceStreamRequestHandler handler = new ResourceStreamRequestHandler(new AbstractResourceStream() { private static final long serialVersionUID = 1L; transient HttpURLConnection con; + @Override public InputStream getInputStream() throws ResourceStreamNotFoundException { try { con = getFeedConnection(url); @@ -82,6 +84,7 @@ public class RssWidgetView extends Widge } } + @Override public void close() throws IOException { if (con != null) { con.disconnect(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java Mon Apr 4 10:49:25 2016 @@ -42,6 +42,7 @@ public class StartWidget extends Abstrac id = "StartWidget"; } + @Override public WidgetView createView(String viewId) { return new StartWidgetView(viewId, new Model<Widget>(this)); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java Mon Apr 4 10:49:25 2016 @@ -25,22 +25,27 @@ import ro.fortsoft.wicket.dashboard.Widg public class StartWidgetDescriptor implements WidgetDescriptor { private static final long serialVersionUID = 1L; + @Override public String getName() { return Application.getString(774L); } + @Override public String getProvider() { return "Apache Openmeetings"; } + @Override public String getDescription() { return Application.getString(804L); } + @Override public String getWidgetClassName() { return StartWidget.class.getName(); } + @Override public String getTypeName() { return "om.widget.start"; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java Mon Apr 4 10:49:25 2016 @@ -42,6 +42,7 @@ public class WelcomeWidget extends Abstr id = "WelcomeWidget"; } + @Override public WidgetView createView(String viewId) { return new WelcomeWidgetView(viewId, new Model<Widget>(this)); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java Mon Apr 4 10:49:25 2016 @@ -25,22 +25,27 @@ import ro.fortsoft.wicket.dashboard.Widg public class WelcomeWidgetDescriptor implements WidgetDescriptor { private static final long serialVersionUID = 1L; + @Override public String getName() { return Application.getString(1546L); } + @Override public String getProvider() { return "Apache Openmeetings"; } + @Override public String getDescription() { return Application.getString(1547L); } + @Override public String getWidgetClassName() { return WelcomeWidget.class.getName(); } + @Override public String getTypeName() { return "om.widget.welcome"; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Mon Apr 4 10:49:25 2016 @@ -122,10 +122,12 @@ public class MessagesContactsPanel exten , new ChoiceRenderer<Integer>() { private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(Integer object) { return Application.getString(object); } + @Override public String getIdValue(Integer object, int index) { return "" + object; } @@ -136,10 +138,12 @@ public class MessagesContactsPanel exten , new ChoiceRenderer<PrivateMessageFolder>() { private static final long serialVersionUID = 1L; + @Override public Object getDisplayValue(PrivateMessageFolder object) { return object.getFolderName(); } + @Override public String getIdValue(PrivateMessageFolder object, int index) { return "" + object.getId(); } @@ -152,7 +156,7 @@ public class MessagesContactsPanel exten trash.add(AttributeAppender.replace("class", "email trash clickable")); } - private void selectFolder(WebMarkupContainer folder) { + private static void selectFolder(WebMarkupContainer folder) { folder.add(AttributeAppender.append("class", "ui-widget-header ui-corner-all")); } @@ -171,7 +175,7 @@ public class MessagesContactsPanel exten target.add(buttons); } - private String getEmail(User u) { + private static String getEmail(User u) { return u == null || u.getAddress() == null ? "" : u.getAddress().getEmail(); } @@ -233,7 +237,7 @@ public class MessagesContactsPanel exten } } - private String getDisplayName(User u) { + private static String getDisplayName(User u) { return new StringBuilder().append(u.getFirstname()).append(" ") .append(u.getLastname()).append(" ") .append("<").append(getEmail(u)).append(">") @@ -521,17 +525,21 @@ public class MessagesContactsPanel exten IDataProvider<UserContact> dp = new IDataProvider<UserContact>() { private static final long serialVersionUID = 1L; + @Override public void detach() { } + @Override public Iterator<? extends UserContact> iterator(long first, long count) { return getBean(UserContactDao.class).get(getUserId(), (int)first, (int)count).iterator(); } + @Override public long size() { return getBean(UserContactDao.class).count(getUserId()); } + @Override public IModel<UserContact> model(UserContact object) { return Model.of(object); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Mon Apr 4 10:49:25 2016 @@ -91,18 +91,22 @@ public class UserSearchPanel extends Use IDataProvider<User> dp = new IDataProvider<User>() { private static final long serialVersionUID = 1L; + @Override public void detach() { } + @Override public Iterator<? extends User> iterator(long first, long count) { return searched ? getBean(UserDao.class).searchUserProfile(getUserId(), text, offer, search, orderBy, (int)first, (int)count, asc).iterator() : new ArrayList<User>().iterator(); } + @Override public long size() { return searched ? getBean(UserDao.class).searchCountUserProfile(getUserId(), text, offer, search) : 0; } + @Override public IModel<User> model(User object) { return new CompoundPropertyModel<User>(object); } @@ -140,7 +144,7 @@ public class UserSearchPanel extends Use }).setOutputMarkupId(true)); } - private String getName(User u) { + private static String getName(User u) { return "" + u.getFirstname() + " " + u.getLastname() + " [" + u.getLogin() + "]"; //FIXME salutation } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java Mon Apr 4 10:49:25 2016 @@ -46,7 +46,7 @@ import ro.fortsoft.wicket.dashboard.web. public class WidgetsPanel extends Panel { private static final long serialVersionUID = 1L; - private Widget isDisplayed(WidgetDescriptor wd) { + private static Widget isDisplayed(WidgetDescriptor wd) { for (Widget w : getDashboard().getWidgets()) { if (w.getClass().getName().equals(wd.getWidgetClassName())) { return w; Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Mon Apr 4 10:49:25 2016 @@ -68,6 +68,7 @@ public class VideoInfo extends Panel { protected void onSubmit(AjaxRequestTarget target, Form<?> form) { final IRecordingConverter converter = getBean(isInterview ? InterviewConverter.class : RecordingConverter.class); new Thread() { + @Override public void run() { converter.startConversion(rm.getObject().getId()); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java Mon Apr 4 10:49:25 2016 @@ -27,18 +27,18 @@ import org.apache.wicket.core.request.ha public class RoomEnterBehavior extends AjaxEventBehavior { private static final long serialVersionUID = 1L; - protected final long roomId; + protected final Long roomId; - public RoomEnterBehavior(long roomId) { + public RoomEnterBehavior(Long roomId) { super("click"); this.roomId = roomId; } - public static OmUrlFragment getRoomUrlFragment(long roomId) { + public static OmUrlFragment getRoomUrlFragment(Long roomId) { return new OmUrlFragment(AreaKeys.room, "" + roomId); } - public static void roomEnter(MainPage page, IPartialPageRequestHandler handler, long roomId) { + public static void roomEnter(MainPage page, IPartialPageRequestHandler handler, Long roomId) { page.updateContents(getRoomUrlFragment(roomId), handler); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AjaxDownload.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AjaxDownload.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AjaxDownload.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AjaxDownload.java Mon Apr 4 10:49:25 2016 @@ -61,6 +61,7 @@ public class AjaxDownload extends Abstra target.appendJavaScript("setTimeout(\"window.location.href='" + url + "'\", 100);"); } + @Override public void onRequest() { ResourceStreamRequestHandler handler = new ResourceStreamRequestHandler(getResourceStream(), getFileName()); handler.setContentDisposition(getContentDisposition()); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java Mon Apr 4 10:49:25 2016 @@ -44,6 +44,7 @@ public class CountryDropDown extends Dro return code; } + @Override public Object getDisplayValue(String code) { return new Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale()); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Mon Apr 4 10:49:25 2016 @@ -83,7 +83,7 @@ public abstract class RecordingResourceR abstract String getFileName(Recording r); abstract File getFile(Recording r); - private Recording getRecording(Long id) { + private static Recording getRecording(Long id) { Recording r = getBean(RecordingDao.class).get(id); // TODO should we process public? // || r.getOwnerId() == 0 || r.getParentFileExplorerItemId() == null || r.getParentFileExplorerItemId() == 0 @@ -107,7 +107,7 @@ public abstract class RecordingResourceR return null; } - private Recording getRecording(Attributes attributes) { + private static Recording getRecording(Attributes attributes) { PageParameters params = attributes.getParameters(); StringValue _id = params.get("id"); Long id = null; Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java Mon Apr 4 10:49:25 2016 @@ -40,6 +40,7 @@ public class RoomTypeDropDown extends Dr return rt.name(); } + @Override public Object getDisplayValue(Type rt) { return getString("room.type." + rt.name()); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java Mon Apr 4 10:49:25 2016 @@ -41,10 +41,12 @@ import com.thoughtworks.xstream.io.xml.D public class UserDashboardPersister implements DashboardPersister { private static final Logger log = getLogger(UserDashboardPersister.class, webAppRootKey); + @Override public Dashboard load() { return new XStreamDashboardPersister().load(); } + @Override public void save(Dashboard dashboard) { new XStreamDashboardPersister().save(dashboard); } Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Mon Apr 4 10:49:25 2016 @@ -85,7 +85,7 @@ public class TestAppointmentAddAppointme assertTrue("Saved appointment should have valid id: " + a.getId(), a.getId() != null && a.getId() > 0); } - private String createClientObj(String firstname, String lastname, String email, String jNameTimeZone) { + private static String createClientObj(String firstname, String lastname, String email, String jNameTimeZone) { StringBuilder sb = new StringBuilder(); sb.append(",") //memberId .append(firstname).append(",") Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Mon Apr 4 10:49:25 2016 @@ -38,7 +38,7 @@ public class TestDatabaseStructureUsersS @Test public void testAddingGroup(){ try { - List<User> users = userDao.get("first", 0, 10, "lastname", false, 1); + List<User> users = userDao.get("first", 0, 10, "lastname", false, 1L); log.debug("[result]" + users.size()); log.debug("[records]"+ users); } catch (Exception err) { Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java Mon Apr 4 10:49:25 2016 @@ -27,16 +27,14 @@ import org.apache.openmeetings.db.dao.se import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.server.Server; import org.apache.openmeetings.test.AbstractJUnitDefaults; -import org.apache.openmeetings.util.OpenmeetingsVariables; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import org.junit.Test; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestDbSession extends AbstractJUnitDefaults { - - protected static final Logger log = Red5LoggerFactory.getLogger( - TestDbSession.class, OpenmeetingsVariables.webAppRootKey); + protected static final Logger log = Red5LoggerFactory.getLogger(TestDbSession.class, webAppRootKey); @Autowired private ServerDao serverDao; @@ -46,7 +44,6 @@ public class TestDbSession extends Abstr @Test public void testDbSessionFunctions() { - clientDao.cleanAllClients(); List<Server> serverList = serverDao.getActiveServers(); @@ -194,5 +191,4 @@ public class TestDbSession extends Abstr countAll = clientDao.countClients(); assertEquals(0, countAll); } - } Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java Mon Apr 4 10:49:25 2016 @@ -27,16 +27,14 @@ import org.apache.openmeetings.db.dao.se import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.server.Server; import org.apache.openmeetings.test.AbstractJUnitDefaults; -import org.apache.openmeetings.util.OpenmeetingsVariables; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import org.junit.Test; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class TestDbSessionGetRoomIds extends AbstractJUnitDefaults { - - protected static final Logger log = Red5LoggerFactory.getLogger( - TestDbSessionGetRoomIds.class, OpenmeetingsVariables.webAppRootKey); + protected static final Logger log = Red5LoggerFactory.getLogger(TestDbSessionGetRoomIds.class, webAppRootKey); @Autowired private ServerDao serverDao; @@ -46,7 +44,6 @@ public class TestDbSessionGetRoomIds ext @Test public void testDbSessionFunctions() { - clientDao.cleanAllClients(); List<Server> serverList = serverDao.getActiveServers(); @@ -95,5 +92,4 @@ public class TestDbSessionGetRoomIds ext int countAll = clientDao.countClients(); assertEquals(0, countAll); } - } Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original) +++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Mon Apr 4 10:49:25 2016 @@ -393,8 +393,8 @@ public class RoomWebService { try { Long userId = sessionDao.checkSession(sid); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { - Boolean result = userManager.kickUserByStreamId(sid, id); - return new ServiceResult(Boolean.TRUE.equals(result) ? 1L : 0L, "Kicked", Type.SUCCESS); + boolean result = userManager.kickUserByStreamId(sid, id); + return new ServiceResult(result ? 1L : 0L, "Kicked", Type.SUCCESS); } else { throw new ServiceException("Insufficient permissions"); //TODO code -26 } @@ -428,7 +428,7 @@ public class RoomWebService { RoomCountBean rCountBean = new RoomCountBean(); rCountBean.setRoomId(room.getId()); rCountBean.setRoomName(room.getName()); - rCountBean.setMaxUser(room.getNumberOfPartizipants().intValue()); + rCountBean.setMaxUser(room.getNumberOfPartizipants()); rCountBean.setRoomCount(sessionManager.getClientListByRoom(room.getId()).size()); roomBeans.add(rCountBean); Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java?rev=1737653&r1=1737652&r2=1737653&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java (original) +++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java Mon Apr 4 10:49:25 2016 @@ -20,8 +20,8 @@ package org.apache.openmeetings.webservi import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.apache.openmeetings.core.remote.ISlaveHTTPConnectionManager; import org.apache.openmeetings.db.entity.server.Server; @@ -47,7 +47,7 @@ public class SlaveHTTPConnectionManager * There can be only one RestClient per server, so we use the primary key of * the server to store the RestClient. */ - private static Map<Long, RestClient> restClientsSessionStore = new HashMap<Long, RestClient>(); + private static Map<Long, RestClient> restClientsSessionStore = new ConcurrentHashMap<>(); /** * Synchronized, cause nobody should manipulate the object while another @@ -57,7 +57,7 @@ public class SlaveHTTPConnectionManager * * @param server */ - private synchronized RestClient getRestClient(Server server) { + private static RestClient getRestClient(Server server) { RestClient restClient = restClientsSessionStore.get(server.getId()); // check if any values of the server have been changed, @@ -86,8 +86,8 @@ public class SlaveHTTPConnectionManager * @param serverId * @param publicSID */ + @Override public void kickSlaveUser(Server server, String publicSID) throws Exception { - RestClient rClient = getRestClient(server); if (rClient == null) { @@ -95,7 +95,5 @@ public class SlaveHTTPConnectionManager } rClient.kickUser(publicSID); - } - }
