This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 77eee95 [OPENMEETINGS-1877] code clean-up
77eee95 is described below
commit 77eee951186414b77a216b9b47a1215aeb32d02b
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Apr 24 21:29:27 2018 +0700
[OPENMEETINGS-1877] code clean-up
---
.../core/remote/ScopeApplicationAdapter.java | 23 -------
.../apache/openmeetings/db/dto/room/CheckDto.java | 74 ----------------------
2 files changed, 97 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index e8736ca..26c3540 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -33,7 +33,6 @@ import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.SipDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.dto.room.CheckDto;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.manager.IClientManager;
import org.apache.openmeetings.db.manager.IStreamClientManager;
@@ -1030,26 +1029,4 @@ public class ScopeApplicationAdapter /*extends
MultiThreadedApplicationAdapter i
return count != null && count > 0 ? count - 1 : 0;
}
*/
- public CheckDto check() {
- /*IConnection current = Red5.getConnectionLocal();
- StreamClient c =
streamClientManager.get(IClientUtil.getId(current.getClient()));
- Client cl = clientManager.getBySid(c.getSid());
- return new CheckDto(cl);
- */
- return new CheckDto(null);
- }
-
- public void resize(Double width, Double height) {
- if (width == null || height == null) {
- return;
- }
- /*
- IConnection current = Red5.getConnectionLocal();
- StreamClient c =
streamClientManager.get(IClientUtil.getId(current.getClient()));
- if (c == null) {
- return;
- }
-
streamClientManager.update(c.setWidth(width.intValue()).setHeight(height.intValue()));
- */
- }
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/CheckDto.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/CheckDto.java
deleted file mode 100644
index 1ef1d2b..0000000
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/CheckDto.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.db.dto.room;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.openmeetings.db.entity.basic.Client;
-import org.apache.openmeetings.db.entity.basic.Client.Activity;
-import org.apache.openmeetings.db.entity.basic.Client.Pod;
-import org.apache.openmeetings.db.entity.room.Room;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CheckDto {
- private final long roomId;
- private final Room.Type roomType;
- private final boolean audioOnly;
- private final Set<Activity> activities = new HashSet<>();
- private final Pod pod;
-
- public CheckDto(Client c) {
- roomId = c.getRoom().getId();
- roomType = c.getRoom().getType();
- audioOnly = c.getRoom().isAudioOnly();
- if (c.hasActivity(Activity.broadcastA)) {
- activities.add(Activity.broadcastA);
- }
- if (c.hasActivity(Activity.broadcastV)) {
- activities.add(Activity.broadcastV);
- }
- pod = c.getPod();
- }
-
- public long getRoomId() {
- return roomId;
- }
-
- public Room.Type getRoomType() {
- return roomType;
- }
-
- public boolean isAudioOnly() {
- return audioOnly;
- }
-
- public Set<Activity> getActivities() {
- return activities;
- }
-
- public Pod getPod() {
- return pod;
- }
-}
--
To stop receiving notification emails like this one, please contact
[email protected].
