You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/02/07 16:15:54 UTC
svn commit: r1782021 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/
trunk/openmeetings-web/src/...
Author: solomax
Date: Tue Feb 7 16:15:54 2017
New Revision: 1782021
URL: http://svn.apache.org/viewvc?rev=1782021&view=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1782021&r1=1782020&r2=1782021&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java Tue Feb 7 16:15:54 2017
@@ -26,12 +26,12 @@ public class MenuItem extends com.google
private static final long serialVersionUID = 1L;
private String desc;
private boolean top;
-
+
public MenuItem(String title, List<IMenuItem> items) {
super(title, items);
setTop(true);
}
-
+
public MenuItem(String title, String desc) {
super(title);
this.desc = desc;
@@ -49,7 +49,9 @@ public class MenuItem extends com.google
return top;
}
- public void setTop(boolean top) {
+ public MenuItem setTop(boolean top) {
this.top = top;
+ return this;
}
}
+
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1782021&r1=1782020&r2=1782021&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Tue Feb 7 16:15:54 2017
@@ -213,7 +213,7 @@ public class RoomMenuPanel extends Panel
add(pollResults = new PollResultsDialog("pollResults", room.getRoom().getId()));
add(sipDialer = new SipDialerDialog("sipDialer", room));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -229,7 +229,7 @@ public class RoomMenuPanel extends Panel
protected void onTimer(int remain) {
getComponent().add(AttributeAppender.replace("title", getText("639", remain)));
}
-
+
@Override
protected void onFinish(AjaxRequestTarget target) {
exit(target);
@@ -237,13 +237,12 @@ public class RoomMenuPanel extends Panel
});
}
}
-
+
private List<IMenuItem> getMenu() {
List<IMenuItem> menu = new ArrayList<>();
exitMenuItem.setEnabled(false);
- exitMenuItem.setTop(true);
- menu.add(exitMenuItem);
-
+ menu.add(exitMenuItem.setTop(true));
+
filesMenu.getItems().add(new RoomMenuItem(Application.getString(15), Application.getString(1479)) {
private static final long serialVersionUID = 1L;
@@ -252,9 +251,8 @@ public class RoomMenuPanel extends Panel
room.getSidebar().showUpload(target);
}
});
- filesMenu.setTop(true);
- menu.add(filesMenu);
-
+ menu.add(filesMenu.setTop(true));
+
actionsMenu.setTop(true);
actionsMenu.getItems().add(inviteMenuItem);
actionsMenu.getItems().add(shareMenuItem); //FIXME enable/disable
@@ -269,7 +267,7 @@ public class RoomMenuPanel extends Panel
menu.add(actionsMenu);
return menu;
}
-
+
public void update(IPartialPageRequestHandler handler) {
if (!isVisible()) {
return;
@@ -352,7 +350,7 @@ public class RoomMenuPanel extends Panel
public static void roomExit(Client c) {
roomExit(c, true);
}
-
+
public static void roomExit(Client c, boolean broadcast) {
Long roomId = c.getRoomId();
removeUserFromRoom(c);
@@ -361,3 +359,4 @@ public class RoomMenuPanel extends Panel
}
}
}
+
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1782021&r1=1782020&r2=1782021&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java Tue Feb 7 16:15:54 2017
@@ -26,12 +26,12 @@ public class MenuItem extends com.google
private static final long serialVersionUID = 1L;
private String desc;
private boolean top;
-
+
public MenuItem(String title, List<IMenuItem> items) {
super(title, items);
setTop(true);
}
-
+
public MenuItem(String title, String desc) {
super(title);
this.desc = desc;
@@ -49,7 +49,9 @@ public class MenuItem extends com.google
return top;
}
- public void setTop(boolean top) {
+ public MenuItem setTop(boolean top) {
this.top = top;
+ return this;
}
}
+
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1782021&r1=1782020&r2=1782021&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Tue Feb 7 16:15:54 2017
@@ -213,7 +213,7 @@ public class RoomMenuPanel extends Panel
add(pollResults = new PollResultsDialog("pollResults", room.getRoom().getId()));
add(sipDialer = new SipDialerDialog("sipDialer", room));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -229,7 +229,7 @@ public class RoomMenuPanel extends Panel
protected void onTimer(int remain) {
getComponent().add(AttributeAppender.replace("title", getText("639", remain)));
}
-
+
@Override
protected void onFinish(AjaxRequestTarget target) {
exit(target);
@@ -237,13 +237,12 @@ public class RoomMenuPanel extends Panel
});
}
}
-
+
private List<IMenuItem> getMenu() {
List<IMenuItem> menu = new ArrayList<>();
exitMenuItem.setEnabled(false);
- exitMenuItem.setTop(true);
- menu.add(exitMenuItem);
-
+ menu.add(exitMenuItem.setTop(true));
+
filesMenu.getItems().add(new RoomMenuItem(Application.getString(15), Application.getString(1479)) {
private static final long serialVersionUID = 1L;
@@ -252,9 +251,8 @@ public class RoomMenuPanel extends Panel
room.getSidebar().showUpload(target);
}
});
- filesMenu.setTop(true);
- menu.add(filesMenu);
-
+ menu.add(filesMenu.setTop(true));
+
actionsMenu.setTop(true);
actionsMenu.getItems().add(inviteMenuItem);
actionsMenu.getItems().add(shareMenuItem); //FIXME enable/disable
@@ -269,7 +267,7 @@ public class RoomMenuPanel extends Panel
menu.add(actionsMenu);
return menu;
}
-
+
public void update(IPartialPageRequestHandler handler) {
if (!isVisible()) {
return;
@@ -352,7 +350,7 @@ public class RoomMenuPanel extends Panel
public static void roomExit(Client c) {
roomExit(c, true);
}
-
+
public static void roomExit(Client c, boolean broadcast) {
Long roomId = c.getRoomId();
removeUserFromRoom(c);
@@ -361,3 +359,4 @@ public class RoomMenuPanel extends Panel
}
}
}
+