Repository: openmeetings Updated Branches: refs/heads/master ce2f7a87a -> 328be41ff
[OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/328be41f Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/328be41f Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/328be41f Branch: refs/heads/master Commit: 328be41ffdb5323d04237fedac43836ada5321d2 Parents: ce2f7a8 Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 9 18:02:44 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 9 18:02:44 2017 +0700 ---------------------------------------------------------------------- .../core/converter/BaseConverter.java | 5 ++- .../core/converter/ImageConverter.java | 6 ++-- .../core/data/file/FileProcessor.java | 4 +-- .../openmeetings/core/remote/MobileService.java | 3 +- .../openmeetings/db/dao/label/LabelDao.java | 2 +- .../openmeetings/db/dao/room/RoomDao.java | 4 +-- .../db/dao/server/SessiondataDao.java | 2 +- .../openmeetings/db/dao/user/IUserManager.java | 2 +- .../openmeetings/db/dao/user/UserDao.java | 4 +-- .../openmeetings/db/dto/room/InvitationDTO.java | 1 - .../openmeetings/backup/BackupImport.java | 10 +++--- .../installation/ImportInitvalues.java | 15 ++++---- .../screenshare/RTMPClientPublish.java | 4 +-- .../src/main/assembly/components/all.xml | 10 +++--- .../openmeetings/service/mail/EmailManager.java | 6 ---- .../service/quartz/scheduler/CleanupJob.java | 4 +-- .../openmeetings/service/user/UserManager.java | 5 ++- .../apache/openmeetings/util/OmFileHelper.java | 4 +-- .../util/OpenmeetingsVariables.java | 1 - .../web/admin/connection/ConnectionsPanel.java | 4 +-- .../web/admin/labels/AddLanguageDialog.java | 6 ++-- .../openmeetings/web/admin/rooms/RoomForm.java | 1 - .../openmeetings/web/admin/users/UserForm.java | 2 +- .../openmeetings/web/app/Application.java | 38 ++++++++++---------- .../apache/openmeetings/web/app/WebSession.java | 4 +-- .../web/common/OmDateTimePicker.java | 2 +- .../web/common/tree/FolderPanel.java | 4 +-- .../openmeetings/web/pages/NotInitedPage.html | 2 +- .../apache/openmeetings/web/room/RoomPanel.java | 2 +- .../web/room/menu/RoomMenuPanel.java | 2 +- .../web/room/sidebar/RoomClientPanel.java | 3 +- .../apache/openmeetings/web/room/wb/wb-board.js | 2 +- .../web/user/InviteUserToRoomDialog.java | 2 +- .../web/user/calendar/AppointmentDialog.java | 5 ++- .../web/user/calendar/CalendarPanel.java | 10 +++--- .../apache/openmeetings/web/user/chat/Chat.java | 2 +- .../web/user/dashboard/WelcomeWidgetView.java | 2 +- .../web/user/profile/MessagesContactsPanel.java | 2 +- .../web/user/profile/ProfileForm.java | 4 +-- .../web/user/profile/UserSearchPanel.html | 2 +- .../web/user/profile/UserSearchPanel.java | 4 +-- .../web/user/record/VideoPlayer.java | 2 +- .../apache/openmeetings/web/util/DateLabel.java | 5 +-- .../web/util/UserChoiceProvider.java | 2 +- .../src/main/webapp/css/general-rtl.css | 2 +- .../src/main/webapp/css/general.css | 2 +- .../TestDatabaseStructureMeetingMember.java | 11 +----- .../webservice/CalendarWebService.java | 2 +- .../openmeetings/webservice/FileWebService.java | 4 +-- .../openmeetings/webservice/UserWebService.java | 2 -- 50 files changed, 101 insertions(+), 128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index 01539c5..fabf270 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -49,8 +49,8 @@ import org.apache.openmeetings.db.entity.record.RecordingMetaData; import org.apache.openmeetings.db.entity.record.RecordingMetaData.Status; import org.apache.openmeetings.db.entity.record.RecordingMetaDelta; import org.apache.openmeetings.util.OmFileHelper; -import org.apache.openmeetings.util.process.ProcessResult; import org.apache.openmeetings.util.process.ProcessHelper; +import org.apache.openmeetings.util.process.ProcessResult; import org.red5.io.flv.impl.FLVWriter; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -167,7 +167,6 @@ public abstract class BaseConverter { } private String[] addSoxPad(List<ProcessResult> returnLog, String job, double length, double position, File inFile, File outFile) throws IOException { - //FIXME need to check this if (length < 0 || position < 0) { log.debug("::addSoxPad {} Invalid parameters: length = {}; position = {}; inFile = {}", job, length, position, inFile); } @@ -377,7 +376,7 @@ public abstract class BaseConverter { "-c:a", "libfaac", "-c:a", "libfdk_aac", "-ar", "22050", - "-b:a", "32k", //FIXME add quality constants + "-b:a", "32k", //TODO add quality constants "-s", getDimensions(r), // mp4path )); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java index fa657ec..beefb99 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java @@ -24,8 +24,8 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG; import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE; import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE; -import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir; import static org.apache.openmeetings.util.OmFileHelper.PROFILE_FILE_NAME; +import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_DPI; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_QUALITY; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; @@ -44,9 +44,9 @@ import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.StoredFile; +import org.apache.openmeetings.util.process.ProcessHelper; import org.apache.openmeetings.util.process.ProcessResult; import org.apache.openmeetings.util.process.ProcessResultList; -import org.apache.openmeetings.util.process.ProcessHelper; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TIFF; import org.apache.tika.parser.ParseContext; @@ -111,7 +111,7 @@ public class ImageConverter extends BaseConverter { us.setPictureuri(pictureuri); userDao.update(us, userId); - //FIXME: After uploading a new picture all other clients should refresh + //TODO: After uploading a new picture all other clients should refresh return returnMap; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java index ca4d77e..438f1ed 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java @@ -35,8 +35,8 @@ import org.apache.openmeetings.db.dao.file.FileItemDao; import org.apache.openmeetings.db.entity.file.BaseFileItem.Type; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.util.StoredFile; -import org.apache.openmeetings.util.process.ProcessResultList; import org.apache.openmeetings.util.process.ProcessResult; +import org.apache.openmeetings.util.process.ProcessResultList; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -56,7 +56,7 @@ public class FileProcessor { @Autowired private DocumentConverter generatePDF; - //FIXME TODO this method need to be refactored to throw exceptions + //TODO this method need to be refactored to throw exceptions public ProcessResultList processFile(FileItem f, InputStream is) throws Exception { ProcessResultList result = new ProcessResultList(); // Generate a random string to prevent any problems with http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java index b81a6e1..e7793b7 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java @@ -166,7 +166,7 @@ public class MobileService { String country = umap.get("stateId"); Long langId = Long.valueOf(umap.get("langId")); - //FIXME TODO unify with Register dialog + //TODO unify with Register dialog String hash = UUID.randomUUID().toString(); String baseURL = cfgDao.getBaseUrl(); @@ -310,7 +310,6 @@ public class MobileService { public List<Map<String, Object>> getRooms() { List<Map<String, Object>> result = new ArrayList<>(); - // FIXME duplicated code IConnection current = Red5.getConnectionLocal(); StreamClient c = sessionManager.get(IClientUtil.getId(current.getClient())); User u = userDao.get(c.getUserId()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index afbd6fb..cc559cd 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -100,7 +100,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ public static synchronized Class<?> getAppClass() throws ClassNotFoundException { if (appClass == null) { - //FIXME HACK to resolve package dependencies + //HACK to resolve package dependencies appClass = Class.forName("org.apache.openmeetings.web.app.Application"); } return appClass; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index 6ebc941..747d571 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -83,7 +83,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { OpenJPAEntityManager oem = OpenJPAPersistence.cast(em); boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled(); try { - oem.getFetchPlan().setQueryResultCacheEnabled(false); //FIXME update in cache during update + oem.getFetchPlan().setQueryResultCacheEnabled(false); //update in cache during update TypedQuery<Room> q = oem.createNamedQuery("getRoomById", Room.class); q.setParameter("id", id); @SuppressWarnings("unchecked") @@ -104,7 +104,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { OpenJPAEntityManager oem = OpenJPAPersistence.cast(em); boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled(); try { - oem.getFetchPlan().setQueryResultCacheEnabled(false); //FIXME update in cache during update + oem.getFetchPlan().setQueryResultCacheEnabled(false); //update in cache during update TypedQuery<Room> q = oem.createNamedQuery("getBackupRooms", Room.class); @SuppressWarnings("unchecked") OpenJPAQuery<Room> kq = OpenJPAPersistence.cast(q); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java index 88ae986..52251b3 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java @@ -171,7 +171,7 @@ public class SessiondataDao { for (StreamClient rcl : sessionManager.listByRoom(roomId)) { String aux = rcl.getSwfurl(); - //FIXME TODO this need to be refactored ! + //TODO this need to be refactored ! int start = aux.indexOf("sid=") + 4; int end = start + 32; if (end > aux.length()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java index 0ddc944..93d420a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java @@ -31,7 +31,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.util.OmException; -//FIXME HACK to bypass cross project compilation +//HACK to bypass cross project compilation public interface IUserManager { Object registerUser(String login, String userpass, String lastname, http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java index a4cab6b..664dbe6 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java @@ -287,7 +287,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { OpenJPAEntityManager oem = OpenJPAPersistence.cast(em); boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled(); try { - oem.getFetchPlan().setQueryResultCacheEnabled(false); //FIXME update in cache during update + oem.getFetchPlan().setQueryResultCacheEnabled(false); //update in cache during update TypedQuery<User> q = oem.createNamedQuery("getUserById", User.class).setParameter("id", id); @SuppressWarnings("unchecked") OpenJPAQuery<User> kq = OpenJPAPersistence.cast(q); @@ -334,7 +334,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { OpenJPAEntityManager oem = OpenJPAPersistence.cast(em); boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled(); try { - oem.getFetchPlan().setQueryResultCacheEnabled(false); //FIXME update in cache during update + oem.getFetchPlan().setQueryResultCacheEnabled(false); //update in cache during update TypedQuery<User> q = oem.createNamedQuery("getAllUsers", User.class); @SuppressWarnings("unchecked") OpenJPAQuery<User> kq = OpenJPAPersistence.cast(q); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java index 460a80b..b320784 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java @@ -205,7 +205,6 @@ public class InvitationDTO implements Serializable { break; } } catch (ParseException e) { - //FIXME TODO need to throw other exception log.error("Unexpected error while creating invitation", e); throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java index 46f0863..55520bf 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java @@ -952,7 +952,7 @@ public class BackupImport { return null; } - //FIXME (need to be removed in later versions) HACK to fix old properties + //TODO (need to be removed in later versions) HACK to fix old properties public List<FileItem> readFileItemList(File baseDir, String fileName, String listNodeName) throws Exception { List<FileItem> list = new ArrayList<>(); File xml = new File(baseDir, fileName); @@ -1031,7 +1031,7 @@ public class BackupImport { return list; } - //FIXME (need to be removed in later versions) HACK to fix old properties + //TODO (need to be removed in later versions) HACK to fix old properties public List<Recording> readRecordingList(File baseDir, String fileName, String listNodeName) throws Exception { List<Recording> list = new ArrayList<>(); File xml = new File(baseDir, fileName); @@ -1093,7 +1093,7 @@ public class BackupImport { return readUserList(new InputSource(xml.toURI().toASCIIString()), listNodeName); } - //FIXME (need to be removed in later versions) HACK to add external attendees previously stored in MeetingMember structure + //TODO (need to be removed in later versions) HACK to add external attendees previously stored in MeetingMember structure private List<MeetingMember> readMeetingMemberList(File baseDir, String filename, String listNodeName) throws Exception { Registry registry = new Registry(); Strategy strategy = new RegistryStrategy(registry); @@ -1169,7 +1169,7 @@ public class BackupImport { return list; } - //FIXME (need to be removed in later versions) HACK to fix 2 deleted nodes in users.xml and inline Address and sipData + //TODO (need to be removed in later versions) HACK to fix 2 deleted nodes in users.xml and inline Address and sipData private List<User> readUserList(InputSource xml, String listNodeName) throws Exception { Registry registry = new Registry(); Strategy strategy = new RegistryStrategy(registry); @@ -1312,7 +1312,7 @@ public class BackupImport { return list; } - //FIXME (need to be removed in later versions) HACK to fix old properties + //TODO (need to be removed in later versions) HACK to fix old properties private List<Room> readRoomList(File baseDir, String fileName, String listNodeName) throws Exception { List<Room> list = new ArrayList<>(); File xml = new File(baseDir, fileName); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index 51811e2..aa1b92b 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -475,12 +475,15 @@ public class ImportInitvalues { } // ------------------------------------------------------------------------------ - - public void loadSystem(InstallationConfig cfg, boolean force) { - // FIXME dummy check if installation was performed before + private void checkInstalled(boolean force) { + // dummy check if installation was performed before if (!force && userDao.count() > 0) { log.debug("System contains users, no need to install data one more time."); } + } + + public void loadSystem(InstallationConfig cfg, boolean force) { + checkInstalled(force); sipDao.delete(); progress = 20; loadConfiguration(cfg); @@ -492,11 +495,7 @@ public class ImportInitvalues { } public void loadAll(InstallationConfig cfg, boolean force) throws Exception { - // FIXME dummy check if installation was performed before - if (!force && userDao.count() > 0) { - log.debug("System contains users, no need to install data one more time."); - return; - } + checkInstalled(force); loadSystem(cfg, force); loadInitUserAndGroup(cfg); progress = 80; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java index 35df2fe..2beea08 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java @@ -82,9 +82,7 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I public void resultReceived(IPendingServiceCall call) { String method = call == null ? null : call.getServiceMethodName(); logger.trace("call ### get Method Name " + method); - if ("connect".equals(method)) { - //setConnectionAsSharingClient(); //FIXME - } else if ("createStream".equals(method)) { + if ("createStream".equals(method)) { if (call.getResult() != null) { publishScreen.setStreamId((Integer)call.getResult()); publish(publishScreen.getStreamId(), id, "live", this); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-server/src/main/assembly/components/all.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/main/assembly/components/all.xml b/openmeetings-server/src/main/assembly/components/all.xml index d4a7f24..018f486 100644 --- a/openmeetings-server/src/main/assembly/components/all.xml +++ b/openmeetings-server/src/main/assembly/components/all.xml @@ -93,14 +93,14 @@ </includes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/public</directory><!-- FIXME should be implemented differently --> + <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/public</directory> <outputDirectory>${root.webapp}</outputDirectory> <includes> <include>favicon.ico</include> </includes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}</directory><!-- FIXME should be implemented differently --> + <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}</directory> <outputDirectory>${om.webapp}</outputDirectory> <excludes> <exclude>META-INF/**</exclude> @@ -122,7 +122,7 @@ </excludes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}</directory><!-- FIXME should be implemented differently --> + <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}</directory> <outputDirectory>${om.webapp}</outputDirectory> <filtered>true</filtered> <includes> @@ -130,7 +130,7 @@ </includes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory><!-- FIXME should be implemented differently --> + <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory> <outputDirectory>lib</outputDirectory> <includes> <include>spring-*</include> @@ -140,7 +140,7 @@ </includes> </fileSet> <fileSet> - <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory><!-- FIXME should be implemented differently --> + <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory> <outputDirectory>plugins</outputDirectory> <includes> <include>tomcat-*</include> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java index ef3e7b7..c5791d9 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java @@ -27,7 +27,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplic import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.mail.MailHandler; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.service.mail.template.FeedbackTemplate; import org.apache.openmeetings.service.mail.template.RegisterUserTemplate; import org.apache.wicket.Application; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -79,9 +78,4 @@ public class EmailManager { , RegisterUserTemplate.getEmail(username, email, sendEmailWithVerficationCode ? link : null)); } } - - //FIXME, seems to be not used - public void sendFeedback(String username, String email, String message) { - mailHandler.send("[email protected]", getString("499"), FeedbackTemplate.getEmail(username, email, message)); - } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java index 4db6031..d6d6cfa 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java @@ -77,7 +77,7 @@ public class CleanupJob extends AbstractJob { return; } try { - //FIXME need to move all these staff to helper + //TODO need to move all these staff to helper File[] folders = getStreamsDir().listFiles(); if (folders != null) { for (File folder : folders) { @@ -105,7 +105,7 @@ public class CleanupJob extends AbstractJob { return; } try { - //FIXME need to move all these staff to helper + //TODO need to move all these staff to helper File[] folders = getStreamsDir().listFiles(); if (folders != null) { for (File folder : folders) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java index c94b202..86022e1 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java @@ -315,12 +315,12 @@ public class UserManager implements IUserManager { } if (!userDao.validLogin(login)) { log.error("Invalid login, please check parameters"); - return null; //TODO FIXME need to be checked + return null; } User u = userDao.getByLogin(login, Type.oauth, serverId); if (!userDao.checkEmail(email, Type.oauth, serverId, u == null ? null : u.getId())) { log.error("Another user with the same email exists"); - return null; //TODO FIXME need to be checked + return null; } // generate random password SecureRandom rnd = new SecureRandom(); @@ -352,7 +352,6 @@ public class UserManager implements IUserManager { } } } - //TODO FIXME should we update fields on login ???? u.setLastlogin(new Date()); u = userDao.update(u, pass, Long.valueOf(-1)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java index 33b628e..fa9f58f 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java @@ -88,7 +88,7 @@ public class OmFileHelper { } public static File getRootDir() { - // FIXME hack !!!! + // hack !!!! return getOmHome().getParentFile().getParentFile(); } @@ -257,7 +257,7 @@ public class OmFileHelper { return new File(parent, name + suffix + ext); } - // FIXME need to be generalized + // TODO need to be generalized public static File getNewFile(File dir, String name, String ext) throws IOException { File f = new File(dir, getName(name, ext)); int recursiveNumber = 0; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index 7f72bea..3c6c86b 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -90,7 +90,6 @@ public class OpenmeetingsVariables { public static final String HEADER_XFRAME_SAMEORIGIN = "SAMEORIGIN"; public static final String HEADER_CSP_SELF = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:;"; public static final int RECENT_ROOMS_COUNT = 5; - public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based public static final int USER_LOGIN_MINIMUM_LENGTH = 4; public static final int USER_PASSWORD_MINIMUM_LENGTH = 8; public static final String DEFAULT_APP_NAME = "OpenMeetings"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java index ce5da41..39f0c54 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java @@ -56,8 +56,7 @@ public class ConnectionsPanel extends AdminBasePanel { SearchableDataProvider<IClient> sdp = new SearchableDataProvider<IClient>(null) { private static final long serialVersionUID = 1L; - //FIXME add search - + //TODO add search private List<IClient> list() { List<IClient> l = new ArrayList<>(); l.addAll(getBean(ISessionManager.class).list()); @@ -67,7 +66,6 @@ public class ConnectionsPanel extends AdminBasePanel { @Override public Iterator<? extends IClient> iterator(long first, long count) { - //FIXME add grouping by public SID List<IClient> l = list(); return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java index b241c43..b992f53 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java @@ -60,13 +60,13 @@ public class AddLanguageDialog extends AbstractFormDialog<String> { try { new Locale.Builder().setLanguageTag(s.getValue()); } catch (IllformedLocaleException e) { - s.error(new ValidationError("Invalid code, please use ")); //FIXME TODO add proper key + s.error(new ValidationError("Invalid code, please use ")); return; } Locale l = Locale.forLanguageTag(s.getValue()); for (Map.Entry<Long, Locale> e : LabelDao.getLanguages()) { if (e.getValue().equals(l)) { - s.error(new ValidationError("This code already added")); //FIXME TODO add proper key + s.error(new ValidationError("This code already added")); break; } } @@ -108,7 +108,7 @@ public class AddLanguageDialog extends AbstractFormDialog<String> { langPanel.getLangForm().updateLanguages(target); target.appendJavaScript("$('#addLanguage').dialog('close');"); } catch (Exception e) { - error("Failed to add, " + e.getMessage()); //FIXME TODO add proper key + error("Failed to add, " + e.getMessage()); target.add(feedback); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index 6bbd85c..e7010e8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -437,7 +437,6 @@ public class RoomForm extends AdminBaseForm<Room> { for (RoomFile rf : r.getFiles()) { rf.setRoomId(r.getId()); } - // FIXME double update getBean(RoomDao.class).update(getModelObject(), getUserId()); } hideNewRecord(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index 87506d2..7817168 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -191,7 +191,7 @@ public class UserForm extends AdminBaseForm<User> { getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null); } } catch (Exception e) { - // FIXME update feedback with the error details + // TODO update feedback with the error details log.error("[onSaveSubmit]: ", e); } setModelObject(getBean(UserDao.class).get(u.getId())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 23df3f7..26dae7c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -156,7 +156,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static final String NAME_ATTR_KEY = "name"; //additional maps for faster searching should be created private DashboardContext dashboardContext; - private static final Set<String> STRINGS_WITH_APP = new HashSet<>(); //FIXME need to be removed + private static final Set<String> STRINGS_WITH_APP = new HashSet<>(); private static String appName; static { STRINGS_WITH_APP.addAll(Arrays.asList("499", "500", "506", "511", "512", "513", "517", "532", "622", "widget.start.desc" @@ -443,10 +443,10 @@ public class Application extends AuthenticatedWebApplication implements IApplica client.setMic(0); client.setRoom(getBean(RoomDao.class).get(rcl.getRoomId())); addUserToRoom(client); - //FIXME TODO unify this + //TODO unify this WebSocketHelper.sendRoom(new RoomMessage(client.getRoom().getId(), client.getUserId(), RoomMessage.Type.roomEnter)); } - //FIXME TODO rights + //TODO rights } else if (client == null && Client.Type.sip == rcl.getType()) { rcl.setLogin(SIP_USER_NAME); rcl.setUserId(SIP_USER_ID); @@ -462,7 +462,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica client.allow(Room.Right.audio, Room.Right.video); client.set(Activity.broadcastA); addUserToRoom(client); - //FIXME TODO unify this + //TODO unify this WebSocketHelper.sendRoom(new RoomMessage(client.getRoom().getId(), client.getUserId(), RoomMessage.Type.roomEnter)); } else { return null; @@ -695,7 +695,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica return false; } - //TODO need more safe way FIXME + //TODO need more safe way public <T> T _getBean(Class<T> clazz) { WebApplicationContext wac = getWebApplicationContext(getServletContext()); return wac == null ? null : wac.getBean(clazz); @@ -757,13 +757,14 @@ public class Application extends AuthenticatedWebApplication implements IApplica } } + //BEGIN hack for email templates support (should be in separate module for now @Override - public <T> T getOmBean(Class<T> clazz) { //FIXME hack for email templates support (should be in separate module for now + public <T> T getOmBean(Class<T> clazz) { return Application.getBean(clazz); } @Override - public <T> T _getOmBean(Class<T> clazz) { //FIXME hack for web services support (should be in separate module for now + public <T> T _getOmBean(Class<T> clazz) { return Application.get()._getBean(clazz); } @@ -772,10 +773,21 @@ public class Application extends AuthenticatedWebApplication implements IApplica } @Override - public String getOmContactsLink() { //FIXME hack for email templates support (should be in separate module for now + public String getOmContactsLink() { return getContactsLink(); } + @Override + public String getOmInvitationLink(Invitation i) { + return getInvitationLink(i, null); + } + + @Override + public String urlForActivatePage(PageParameters pp) { + return urlForPage(ActivatePage.class, pp, null); + } + //END hack for email templates support (should be in separate module for now + public static String getInvitationLink(Invitation i, String baseUrl) { String link = ""; Room r = i.getRoom(); @@ -807,11 +819,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica return link; } - @Override - public String getOmInvitationLink(Invitation i) { //FIXME hack for email templates support (should be in separate module for now - return getInvitationLink(i, null); - } - public static String urlForPage(Class<? extends Page> clazz, PageParameters pp, String _baseUrl) { RequestCycle rc = RequestCycle.get(); String baseUrl = getBean(ConfigurationDao.class).getBaseUrl(); @@ -822,11 +829,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica } @Override - public String urlForActivatePage(PageParameters pp) { //FIXME hack for email templates support (should be in separate module for now - return urlForPage(ActivatePage.class, pp, null); - } - - @Override public String getOmString(String key, long languageId) { return getString(key, languageId); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java index 9d1a2d7..387daf6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java @@ -226,7 +226,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS user = userDao.getNewUserInstance(null); user.setFirstname(remoteUser.getFirstname()); user.setLastname(remoteUser.getLastname()); - user.setLogin(remoteUser.getUsername()); //FIXME check if login UNIQUE + user.setLogin(remoteUser.getUsername()); user.setType(Type.external); user.setExternalId(remoteUser.getExternalUserId()); user.setExternalType(remoteUser.getExternalUserType()); @@ -243,7 +243,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS if (markUsed) { soapLogin.setUsed(true); soapLogin.setUseDate(new Date()); - //soapLogin.setClientURL(clientURL); //FIXME + //soapLogin.setClientURL(clientURL); //TODO soapDao.update(soapLogin); } roomId = soapLogin.getRoomId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java index 6e7cf9e..2b28eff 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java @@ -56,7 +56,7 @@ public class OmDateTimePicker extends DateTimePicker { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - //FIXME TODO this is remain here until localized AM/PM will be correctly handled + //TODO this is remain here until localized AM/PM will be correctly handled //response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java index afc7bab..257a251 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java @@ -24,9 +24,9 @@ import java.util.Map.Entry; import org.apache.openmeetings.db.dao.file.FileItemDao; import org.apache.openmeetings.db.dao.record.RecordingDao; -import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.file.BaseFileItem; import org.apache.openmeetings.db.entity.file.BaseFileItem.Type; +import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.record.Recording; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; @@ -130,7 +130,7 @@ public class FolderPanel extends Panel { private static void move(final FileTreePanel treePanel, AjaxRequestTarget target, BaseFileItem p, BaseFileItem f) { Long pid = p.getId(); - //FIXME parent should not be moved to child !!!!!!! + //TODO parent should not be moved to child !!!!!!! if (pid != null && pid.equals(f.getId())) { return; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html index 895423e..88bf654 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html @@ -20,7 +20,7 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:extend> - <!-- FIXME localized versions of this file need to be created --> + <!-- TODO localized versions of this file need to be created --> <div class="message"> <b>OpenMeetings - Loading ...</b><br /> The server is not yet completely initialized. Please try again in a couple of seconds.<br/> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index d288f82..fc940ee 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -655,7 +655,7 @@ public class RoomPanel extends BasePanel { c.allow(Right.superModerator); update(c); } else { - //FIXME TODO !!! c.getUser != getUserId + //TODO !!! c.getUser != getUserId Set<Right> rr = AuthLevelUtil.getRoomRight(c.getUser(), r, r.isAppointment() ? getBean(AppointmentDao.class).getByRoom(r.getId()) : null, getRoomClients(r.getId()).size()); if (!rr.isEmpty()) { c.allow(rr); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 9bb3a99..2d358ba 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -340,7 +340,7 @@ public class RoomMenuPanel extends Panel { if (recClient != null) { roomTitle.append(String.format("%s %s %s %s %s", getString("419") , recClient.getUser().getLogin(), recClient.getUser().getFirstname(), recClient.getUser().getLastname(), df.format(recClient.getConnectedSince()))); - //FIXME TODO get ConnectedSince of StreamClient + //TODO get ConnectedSince of StreamClient roomClass.append(" screen"); } Client pubClient = getClientBySid(room.getPublishingUser()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java index 1b3889f..aa20fc0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java @@ -100,8 +100,7 @@ public class RoomClientPanel extends Panel { status = "status-user"; statusTitle = "677"; } - //FIXME TODO add 'typingActivity' - //FIXME TODO add ability to change 'first/last name' + //TODO add ability to change 'first/last name' add(new WebMarkupContainer("status").add(AttributeModifier.append("class", status), AttributeModifier.replace("title", getString(statusTitle)))); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index 90efa25..c92b4e6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -452,7 +452,7 @@ var Wb = function() { $(this).find('.canvas-container').each(function(idx) { const h = $(this).height(), pos = $(this).position(); if (slide !== idx && pos.top > BUMPER - h && pos.top < BUMPER) { - //TODO FIXME might be done without iterating + //TODO might be done without iterating _setSlide(idx); return false; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java index f7b4861..eaf299a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java @@ -54,7 +54,7 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> { @Override public void onRoomEnter(AjaxRequestTarget target, Long roomId) { - //FIXME TODO only show message if other user is online + //TODO only show message if other user is online inviteMsg.open(target, roomId, userId); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java index ebebd50..bad11d4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java @@ -113,7 +113,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); final MessageDialog confirmDelete; private final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container"); - //FIXME TODO need to be unified with RoomInvitationForm + //TODO need to be unified with RoomInvitationForm private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user)); private final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups" , new CollectionModel<Group>(new ArrayList<>()) @@ -494,14 +494,13 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { } private List<Room> getRoomList() { - //FIXME need to be reviewed List<Room> result = new ArrayList<>(); RoomDao dao = getBean(RoomDao.class); result.addAll(dao.getPublicRooms()); for (GroupUser ou : getBean(UserDao.class).get(getUserId()).getGroupUsers()) { result.addAll(dao.getGroupRooms(ou.getGroup().getId())); } - if (getModelObject().getRoom() != null && getModelObject().getRoom().isAppointment()) { //FIXME review + if (getModelObject().getRoom() != null && getModelObject().getRoom().isAppointment()) { result.add(getModelObject().getRoom()); } return result; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java index 4bc7cb3..7dd9b8d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java @@ -215,11 +215,11 @@ public class CalendarPanel extends UserBasePanel { } java.util.Calendar cal = WebSession.getCalendar(); cal.setTime(a.getStart()); - cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME? + cal.add(java.util.Calendar.MILLISECOND, (int)delta); a.setStart(cal.getTime()); cal.setTime(a.getEnd()); - cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME? + cal.add(java.util.Calendar.MILLISECOND, (int)delta); a.setEnd(cal.getTime()); dao.update(a, getUserId()); @@ -227,7 +227,7 @@ public class CalendarPanel extends UserBasePanel { if (a.getCalendar() != null) { updatedeleteAppointment(target, CalendarDialog.DIALOG_TYPE.UPDATE_APPOINTMENT, a); } - //FIXME add feedback info + //TODO add feedback info } @Override @@ -239,7 +239,7 @@ public class CalendarPanel extends UserBasePanel { } java.util.Calendar cal = WebSession.getCalendar(); cal.setTime(a.getEnd()); - cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME? + cal.add(java.util.Calendar.MILLISECOND, (int)delta); a.setEnd(cal.getTime()); dao.update(a, getUserId()); @@ -247,7 +247,7 @@ public class CalendarPanel extends UserBasePanel { if (a.getCalendar() != null) { updatedeleteAppointment(target, CalendarDialog.DIALOG_TYPE.UPDATE_APPOINTMENT, a); } - //FIXME add feedback info + //TODO add feedback info } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index 5280be3..a0d8f8b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -163,7 +163,7 @@ public class Chat extends Panel { if (showDashboardChat) { ChatDao dao = getBean(ChatDao.class); - //FIXME limited count should be loaded with "earlier" link + //TODO limited count should be loaded with "earlier" link List<ChatMessage> list = new ArrayList<>(dao.getGlobal(0, 30)); for(Long roomId : getUserRooms(getUserId())) { Room r = getBean(RoomDao.class).get(roomId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java index 4c4543b..7bbff60 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java @@ -49,7 +49,7 @@ public class WelcomeWidgetView extends WidgetView { User u = getBean(UserDao.class).get(getUserId()); add(new UploadableProfileImagePanel("img", getUserId())); - //FIXME this need to be aligned according to Locale + //TODO this need to be aligned according to Locale add(new Label("firstname", Model.of(u.getFirstname()))); add(new Label("lastname", Model.of(u.getLastname()))); add(new Label("tz", Model.of(u.getTimeZoneId()))); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index e62237a..87189ab 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -433,7 +433,7 @@ public class MessagesContactsPanel extends UserBasePanel { private static final long serialVersionUID = 1L; private String getName(UserContact uc) { - return uc.getOwner().getFirstname() + " " + uc.getOwner().getLastname(); //FIXME salutation + return uc.getOwner().getFirstname() + " " + uc.getOwner().getLastname(); //TODO salutation, UNIFY } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java index 5a8dc4e..8cad586 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java @@ -89,7 +89,7 @@ public class ProfileForm extends Form<User> { @Override protected void onSaveError(AjaxRequestTarget target, Form<?> form) { - // FIXME update feedback with the error details + // TODO update feedback with the error details } @Override @@ -100,7 +100,7 @@ public class ProfileForm extends Form<User> { @Override protected void onRefreshError(AjaxRequestTarget target, Form<?> form) { - // FIXME update feedback with the error details + // TODO update feedback with the error details } }); add(new WebMarkupContainer("changePwd").add(new ButtonBehavior("#changePwd"), new AjaxEventBehavior("click") { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html index 1644df5..3d9e006 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html @@ -20,7 +20,7 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> - <!-- FIXME move styles into CSS --> + <!-- TODO move styles into CSS --> <table style="width: 100%; height: 100%;"> <tr> <td valign="top" style="width: 200px;"> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index 9e488bd..b2f3bfc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -125,7 +125,7 @@ public class UserSearchPanel extends UserBasePanel { .add(addOnClick(String.format("addContact(%s);", userId)))); item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(addOnClick(String.format("privateMessage(%s);", userId)))); item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(addOnClick(String.format("inviteUser(%s);", userId)))); - //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME + //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); } }; @@ -144,7 +144,7 @@ public class UserSearchPanel extends UserBasePanel { } private static String getName(User u) { - return "" + u.getFirstname() + " " + u.getLastname() + " [" + u.getLogin() + "]"; //FIXME salutation + return "" + u.getFirstname() + " " + u.getLastname() + " [" + u.getLogin() + "]"; //TODO salutation } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java index 3102264..bee53f4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java @@ -33,7 +33,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; public class VideoPlayer extends Panel { private static final long serialVersionUID = 1L; - private final WebMarkupContainer wait = new WebMarkupContainer("wait"); //FIXME not used + private final WebMarkupContainer wait = new WebMarkupContainer("wait"); //TODO not used private final WebMarkupContainer container = new WebMarkupContainer("container"); private final Mp4RecordingResourceReference mp4RecRes = new Mp4RecordingResourceReference(); private final PngRecordingResourceReference posterRecRes = new PngRecordingResourceReference(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java index 921fe96..0de2e5d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.web.util; -import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN; +import static org.apache.commons.lang3.time.FastDateFormat.MEDIUM; import java.util.Calendar; import java.util.Date; @@ -30,10 +30,11 @@ import org.apache.wicket.markup.html.basic.Label; public class DateLabel extends Label { private static final long serialVersionUID = 1L; - private static final FastDateFormat fmt = FastDateFormat.getInstance(WEB_DATE_PATTERN); + private final FastDateFormat fmt; public DateLabel(String id) { super(id); + fmt = FastDateFormat.getDateTimeInstance(MEDIUM, MEDIUM, getLocale()); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java index 59cdc3f..f733e5b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java @@ -43,7 +43,7 @@ public class UserChoiceProvider extends RestrictiveChoiceProvider<User> { public static User getUser(String value) { User u = null; if (!Strings.isEmpty(value)) { - //FIXME refactor this + //TODO refactor this String email = null; String fName = null; String lName = null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/webapp/css/general-rtl.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/general-rtl.css b/openmeetings-web/src/main/webapp/css/general-rtl.css index 8eca0c8..09d62a0 100644 --- a/openmeetings-web/src/main/webapp/css/general-rtl.css +++ b/openmeetings-web/src/main/webapp/css/general-rtl.css @@ -84,7 +84,7 @@ form .input { float: left !important; } -/**** FIXME need to be moved to wicket-jquery-ui **************/ +/**** TODO need to be moved to wicket-jquery-ui **************/ span.css-emoticon { transform: rotate(-90deg) !important; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/main/webapp/css/general.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/general.css b/openmeetings-web/src/main/webapp/css/general.css index 10bae24..fe032a6 100644 --- a/openmeetings-web/src/main/webapp/css/general.css +++ b/openmeetings-web/src/main/webapp/css/general.css @@ -551,7 +551,7 @@ form .input { width: 75%; vertical-align: middle; } - /**** FIXME TODO need to be unified with other icons used ****/ + /**** TODO need to be unified with other icons used ****/ div.formSaveBar { height: 22px; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java index 20d3d54..53c9959 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java @@ -27,15 +27,6 @@ public class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults { @Test public void testUpdateMeetingMember(){ - //FIXME need to be refactored !!!! - - //MeetingMemberDaoImpl.getInstance().addMeetingMember("Adddd", "dir", "1", "2", 1L, 1L, "test"); - //MeetingMemberDaoImpl.getInstance().addMeetingMember(firstname, lastname, memberStatus, appointmentStatus, appointmentId, userid, email) - - - //MeetingMemberDaoImpl.getInstance().getMeetingMemberById(1L); - //MeetingMemberDaoImpl.getInstance().deleteMeetingMember(2L); - - //meetingMemberDao.updateMeetingMember(1l,"bbbbbb", "dir", "1", "2", 1L, 1L, "test", ""); + //TODO add test } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java index 5d0ea30..6b7068e 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java @@ -277,7 +277,7 @@ public class CalendarWebService extends BaseWebService { */ @WebMethod @POST - @Path("/") //TODO FIXME update is also here for now + @Path("/") public AppointmentDTO save(@QueryParam("sid") @WebParam(name="sid") String sid, @FormParam("appointment") @WebParam(name="appointment") AppointmentDTO appointment) throws ServiceException { //Seems to be create log.debug("save SID:" + sid); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java index 042df46..d33a82b 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java @@ -319,7 +319,7 @@ public class FileWebService extends BaseWebService { { try { if (AuthLevelUtil.hasUserLevel(getRights(sid))) { - // FIXME TODO: check if this user is allowed to change this file + // TODO: check if this user is allowed to change this file log.debug("rename " + id); FileItem f = getFileDao().rename(id, name); @@ -359,7 +359,7 @@ public class FileWebService extends BaseWebService { Sessiondata sd = check(sid); Long userId = sd.getUserId(); if (AuthLevelUtil.hasUserLevel(getRights(userId))) { - // FIXME TODO A test is required that checks if the user is allowed to move the file + // TODO A test is required that checks if the user is allowed to move the file log.debug("move " + id); FileItem f = getFileDao().move(id, parentId, userId, roomId); return f == null ? null : new FileItemDTO(f); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index 3dcff6b..dcf2809 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -236,8 +236,6 @@ public class UserWebService extends BaseWebService { } } - //FIXME no update - /** * * Delete a certain user by its id
