Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java Tue Apr 12 05:22:58 2016 @@ -42,7 +42,7 @@ public class WhiteBoardObjectSyncManager /* * Initial Sync Process */ - public synchronized void setWhiteBoardSyncListByRoomid(Long roomId, Map<String, WhiteboardSyncLockObject> mapObject) { + public void setWhiteBoardSyncListByRoomid(Long roomId, Map<String, WhiteboardSyncLockObject> mapObject) { whiteBoardSyncList.put(roomId, mapObject); } @@ -57,11 +57,11 @@ public class WhiteBoardObjectSyncManager /* * Image Sync Process */ - public synchronized void setWhiteBoardImagesSyncListByRoomid(Long roomId, Map<String, Map<String, WhiteboardSyncLockObject>> mapObject) { + public void setWhiteBoardImagesSyncListByRoomid(Long roomId, Map<String, Map<String, WhiteboardSyncLockObject>> mapObject) { whiteBoardObjectSyncList.put(roomId, mapObject); } - public synchronized void setWhiteBoardImagesSyncListByRoomAndObjectId(Long roomId, String objectId, Map<String, WhiteboardSyncLockObject> imageSyncList) { + public void setWhiteBoardImagesSyncListByRoomAndObjectId(Long roomId, String objectId, Map<String, WhiteboardSyncLockObject> imageSyncList) { Map<String, Map<String, WhiteboardSyncLockObject>> roomList = getWhiteBoardObjectSyncListByRoomid(roomId); if (imageSyncList.isEmpty()) { roomList.remove(objectId); @@ -71,7 +71,7 @@ public class WhiteBoardObjectSyncManager setWhiteBoardImagesSyncListByRoomid(roomId, roomList); } - public synchronized Map<String, Map<String, WhiteboardSyncLockObject>> getWhiteBoardObjectSyncListByRoomid(Long roomId) { + public Map<String, Map<String, WhiteboardSyncLockObject>> getWhiteBoardObjectSyncListByRoomid(Long roomId) { if (whiteBoardObjectSyncList.containsKey(roomId)) { return whiteBoardObjectSyncList.get(roomId); } else { @@ -79,7 +79,7 @@ public class WhiteBoardObjectSyncManager } } - public synchronized Map<String, WhiteboardSyncLockObject> getWhiteBoardObjectSyncListByRoomAndObjectId(Long roomId, String objectId) { + public Map<String, WhiteboardSyncLockObject> getWhiteBoardObjectSyncListByRoomAndObjectId(Long roomId, String objectId) { log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomId: " + roomId); Map<String, Map<String, WhiteboardSyncLockObject>> roomList = getWhiteBoardObjectSyncListByRoomid(roomId); if (log.isDebugEnabled()) { @@ -95,5 +95,4 @@ public class WhiteBoardObjectSyncManager } return imageSyncList; } - }
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java Tue Apr 12 05:22:58 2016 @@ -169,7 +169,7 @@ public class WhiteboardManager { if (swfObj != null) { if (swfObj.get("name").equals(baseObjectName)) { - swfObj.put("isVisible", Integer.valueOf(swfObj.get("slide").toString()).intValue() == slidesNumber); + swfObj.put("isVisible", Integer.parseInt(swfObj.get("slide").toString()) == slidesNumber); actionObjectStored.set(actionObjectStored.size() - 7, swfObj); } } Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Tue Apr 12 05:22:58 2016 @@ -102,7 +102,7 @@ public class LabelDao implements IDataPr for (Map.Entry<Long, Locale> e : languages.entrySet()) { id = e.getKey(); } - languages.put(++id, l); + languages.put(id + 1, l); storeLanguages(); labelCache.put(l, new ArrayList<StringLabel>()); } Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java Tue Apr 12 05:22:58 2016 @@ -51,7 +51,7 @@ public class CleanupHelper { List<File> invalid = new ArrayList<>(); List<File> deleted = new ArrayList<>(); int missing = 0; - for (File profile : parent.listFiles()) { + for (File profile : list(parent, null)) { long userId = getUserIdByProfile(profile.getName()); User u = udao.get(userId); if (profile.isFile() || userId < 0 || u == null) { @@ -81,7 +81,7 @@ public class CleanupHelper { List<File> invalid = new ArrayList<>(); List<File> deleted = new ArrayList<>(); int missing = 0; - for (File f : parent.listFiles()) { + for (File f : list(parent, null)) { FileExplorerItem item = fileDao.getByHash(f.getName()); // TODO probable extension should be stripped if (item == null) { invalid.add(f); @@ -103,7 +103,7 @@ public class CleanupHelper { List<File> invalid = new ArrayList<>(); List<File> deleted = new ArrayList<>(); int missing = 0; - for (File f : hibernateDir.listFiles(new FilenameFilter() { + for (File f : list(hibernateDir, new FilenameFilter() { @Override public boolean accept(File dir, String name) { return name.startsWith(recordingFileName) && name.endsWith(FLV_EXTENSION); @@ -132,7 +132,7 @@ public class CleanupHelper { @Override public void cleanup() throws IOException { String hiberPath = hibernateDir.getCanonicalPath(); - for (File f : getParent().listFiles()) { + for (File f : list(getParent(), null)) { if (!f.getCanonicalPath().equals(hiberPath)) { FileHelper.removeRec(f); } @@ -142,8 +142,13 @@ public class CleanupHelper { }; } + private static File[] list(File f, FilenameFilter ff) { + File[] l = ff == null ? f.listFiles() : f.listFiles(ff); + return l == null ? new File[0] : l; + } + private static File[] list(final Long id) { - return hibernateDir.listFiles(new FilenameFilter() { + return list(hibernateDir, new FilenameFilter() { @Override public boolean accept(File dir, String name) { return name.startsWith(recordingFileName + id); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Tue Apr 12 05:22:58 2016 @@ -1916,5 +1916,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Tue Apr 12 05:22:58 2016 @@ -1900,5 +1900,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Tue Apr 12 05:22:58 2016 @@ -1872,5 +1872,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Tue Apr 12 05:22:58 2016 @@ -1894,5 +1894,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Tue Apr 12 05:22:58 2016 @@ -1908,5 +1908,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Tue Apr 12 05:22:58 2016 @@ -1912,5 +1912,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Ðапка streams:</entry> <entry key="dashboard.widget.admin.cleanup.final">пÑеобÑазованнÑе:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">ÐÑиÑÑиÑÑ</entry> + <entry key="dashboard.widget.admin.cleanup.warn">ÐÑ ÑвеÑÐµÐ½Ñ ÑÑо Ñ Ð¾ÑиÑе ÑдалиÑÑ Ð²Ñе вÑеменнÑе ÑайлÑ? ÐÑÑ Ð¾Ð¿ÐµÑаÑÐ¸Ñ Ð½ÐµÐ»ÑÐ·Ñ Ð±ÑÐ´ÐµÑ Ð¾ÑмениÑÑ.</entry> <entry key="dashboard.widget.admin.cleanup.error">ÐеизвеÑÑÐ½Ð°Ñ Ð¾Ñибка пÑи попÑÑке оÑиÑÑиÑÑ</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Tue Apr 12 05:22:58 2016 @@ -1876,5 +1876,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Tue Apr 12 05:22:58 2016 @@ -1906,5 +1906,6 @@ <entry key="dashboard.widget.admin.cleanup.streams">Streams folder:</entry> <entry key="dashboard.widget.admin.cleanup.final">final:</entry> <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry> + <entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry> <entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java Tue Apr 12 05:22:58 2016 @@ -92,7 +92,7 @@ public abstract class AddFolderDialog ex } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return add; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java Tue Apr 12 05:22:58 2016 @@ -117,7 +117,7 @@ public abstract class ConfirmableAjaxBor private static final long serialVersionUID = 1L; @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return this.findButton(OK); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java Tue Apr 12 05:22:58 2016 @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.common; +import java.util.Locale; + import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; @@ -26,6 +28,7 @@ import org.threeten.bp.LocalDate; import org.threeten.bp.LocalDateTime; import org.threeten.bp.LocalTime; +import com.googlecode.wicket.jquery.core.Options; import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker; import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker; import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker; @@ -39,12 +42,12 @@ public class OmDateTimePicker extends Da } @Override - protected DatePicker newDatePicker(String id, IModel<LocalDate> model, String datePattern) { + protected DatePicker newDatePicker(String id, IModel<LocalDate> model, Locale locale, String datePattern, Options options) { return new DatePicker(id, model, WebSession.get().getLocale()); } @Override - protected TimePicker newTimePicker(String id, IModel<LocalTime> model, String timePattern) { + protected TimePicker newTimePicker(String id, IModel<LocalTime> model, Locale locale, String timePattern, Options options) { return new TimePicker(id, model, WebSession.get().getLocale()); } 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=1738687&r1=1738686&r2=1738687&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 Tue Apr 12 05:22:58 2016 @@ -178,7 +178,7 @@ public class ForgetPasswordDialog extend } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return send; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Tue Apr 12 05:22:58 2016 @@ -176,7 +176,7 @@ public class RegisterDialog extends Abst } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return registerBtn; } 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=1738687&r1=1738686&r2=1738687&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 Tue Apr 12 05:22:58 2016 @@ -132,7 +132,7 @@ public class ResetPasswordDialog extends } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return resetBtn; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Tue Apr 12 05:22:58 2016 @@ -140,7 +140,7 @@ public class SignInDialog extends Abstra } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return loginBtn; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java Tue Apr 12 05:22:58 2016 @@ -205,7 +205,7 @@ public class InvitationDialog extends Ab } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return send; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Tue Apr 12 05:22:58 2016 @@ -77,7 +77,7 @@ public class CreatePollDialog extends Ab } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return create; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java Tue Apr 12 05:22:58 2016 @@ -96,7 +96,7 @@ public class VoteDialog extends Abstract * @see com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog#getSubmitButton() */ @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return vote; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java Tue Apr 12 05:22:58 2016 @@ -49,7 +49,7 @@ public class InviteUserMessageDialog ext public InviteUserMessageDialog(String id) { super(id, Application.getString(1138)); - add(form.add(message.setRequired(true), enterRoom).setOutputMarkupId(true)); + add(form.add(message.setRequired(true), enterRoom.setOutputMarkupId(true)).setOutputMarkupId(true)); } public void open(IPartialPageRequestHandler handler, Long roomId, Long userId) { @@ -67,7 +67,7 @@ public class InviteUserMessageDialog ext } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return send; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Tue Apr 12 05:22:58 2016 @@ -166,7 +166,7 @@ public class MessageDialog extends Abstr } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return send; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Tue Apr 12 05:22:58 2016 @@ -153,7 +153,7 @@ public class AppointmentDialog extends A } @Override - protected DialogButton getSubmitButton() { + public DialogButton getSubmitButton() { return save; } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html Tue Apr 12 05:22:58 2016 @@ -39,7 +39,7 @@ </ul> </li> </ul> - <form wicket:id="form"><button wicket:id="cleanup"><wicket:message key="dashboard.widget.admin.cleanup.cleanup"/></button></form> + <form wicket:id="form"><div wicket:id="cleanup"></div></form> </div> </div> </wicket:panel> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java Tue Apr 12 05:22:58 2016 @@ -42,7 +42,7 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.model.Model; import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton; +import com.googlecode.wicket.jquery.ui.form.button.ConfirmAjaxButton; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; @@ -70,16 +70,38 @@ public class AdminCleanupInfoDialog exte files = new CleanupEntityUnitPanel("files", "dashboard.widget.admin.cleanup.files", new CleanupEntityUnit()); streamsSize = new Label("streams-size", ""); fin = new CleanupEntityUnitPanel("final", "dashboard.widget.admin.cleanup.final", new CleanupEntityUnit()); - - add(feedback); + + add(feedback.setOutputMarkupId(true)); add(container.add(temp, uploadSize, profile, imp, backup, files, streamsSize, fin).setOutputMarkupId(true)); - add(new Form<Void>("form").add(new IndicatingAjaxButton("cleanup") { + add(new Form<Void>("form") { private static final long serialVersionUID = 1L; @Override - protected void onSubmit(AjaxRequestTarget target, Form<?> form) { - } - })); + protected void onInitialize() { + super.onInitialize(); + add(new ConfirmAjaxButton("cleanup", getString("dashboard.widget.admin.cleanup.cleanup") + , getString("dashboard.widget.admin.cleanup.cleanup") + , getString("dashboard.widget.admin.cleanup.warn")) + { + private static final long serialVersionUID = 1L; + + @Override + protected boolean isIndicating() { + return true; + } + + @Override + protected void onSubmit(AjaxRequestTarget target, Form<?> form) { + cleanup(target); + } + + @Override + protected void onError(AjaxRequestTarget target, Form<?> form) { + target.add(feedback); + } + }); + } + }); } @Override Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java Tue Apr 12 05:22:58 2016 @@ -30,18 +30,23 @@ import ro.fortsoft.wicket.dashboard.web. public class AdminWidgetView extends WidgetView { private static final long serialVersionUID = 1L; private final AdminCleanupInfoDialog cleanupDialog; + final Form<Void> form = new Form<>("form"); public AdminWidgetView(String id, Model<Widget> model) { super(id, model); - final Form<Void> form = new Form<>("form"); add(form); form.add(cleanupDialog = new AdminCleanupInfoDialog("cleanup-dialog")); form.add(new IndicatingAjaxButton("show-cleanup-dialog") { private static final long serialVersionUID = 1L; - + + @Override + protected boolean isDisabledOnClick() { + return true; + } + @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { - cleanupDialog.cleanup(target); + cleanupDialog.show(target); } }); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html Tue Apr 12 05:22:58 2016 @@ -21,6 +21,7 @@ <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> <div wicket:id="buttons"></div> + <div wicket:id="feedback"></div> <table style="width: 100%; height: 100%"> <tr> <td rowspan="2"> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1738687&r1=1738686&r2=1738687&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Tue Apr 12 05:22:58 2016 @@ -34,13 +34,18 @@ import org.apache.wicket.markup.html.pan import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.util.time.Duration; +import com.googlecode.wicket.jquery.core.Options; +import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; + public class ProfileForm extends Form<User> { private static final long serialVersionUID = 1L; private final UserForm userForm; + private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); public ProfileForm(String id) { super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId()))); + add(feedback.setOutputMarkupId(true)); add(new FormSaveRefreshPanel<User>("buttons", this) { private static final long serialVersionUID = 1L; @@ -50,7 +55,7 @@ public class ProfileForm extends Form<Us try { u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId()); } catch (Exception e) { - // FIXME update feedback with the error details + error(e.getMessage()); } setModelObject(u); target.add(ProfileForm.this);
