[OPENMEETINGS-551] basic save is added, code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e78466d5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e78466d5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e78466d5 Branch: refs/heads/3.2.x Commit: e78466d5d5af373477162765ab0038ec05fc77fd Parents: 4df306f Author: Maxim Solodovnik <[email protected]> Authored: Wed Apr 5 03:56:54 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Apr 5 03:56:54 2017 +0000 ---------------------------------------------------------------------- .../db/dto/file/FileExplorerItemDTO.java | 19 ++- .../db/dto/room/RoomOptionsDTO.java | 1 - .../openmeetings/db/dto/room/Whiteboard.java | 5 +- .../web/common/AddFolderDialog.html | 29 ----- .../web/common/AddFolderDialog.java | 107 ---------------- .../openmeetings/web/common/NameDialog.html | 29 +++++ .../openmeetings/web/common/NameDialog.java | 125 +++++++++++++++++++ .../web/common/tree/FileTreePanel.java | 6 +- .../web/room/sidebar/RoomFilePanel.java | 4 +- .../web/room/sidebar/RoomSidebar.java | 4 +- .../web/user/profile/MessagesContactsPanel.java | 4 +- .../web/user/record/RecordingsPanel.java | 4 +- .../src/main/webapp/WEB-INF/web.xml | 12 +- 13 files changed, 189 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java index e384ad5..49f7b23 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java @@ -31,7 +31,7 @@ import org.apache.openmeetings.db.entity.file.FileItem.Type; /** * This Object will represent a File on the File-System - * + * * @author sebastianwagner * */ @@ -44,6 +44,7 @@ public class FileExplorerItemDTO implements Serializable { private String hash; private Long parentId; private Long roomId; + private Long groupId; private Long ownerId; private Long size; private String externalId; @@ -60,6 +61,7 @@ public class FileExplorerItemDTO implements Serializable { hash = f.getHash(); parentId = f.getParentId(); roomId = f.getRoomId(); + groupId = f.getGroupId(); ownerId = f.getOwnerId(); size = f.getSize(); externalId = f.getExternalId(); @@ -68,7 +70,7 @@ public class FileExplorerItemDTO implements Serializable { width = f.getWidth(); height = f.getHeight(); } - + public FileExplorerItem get() { FileExplorerItem f = new FileExplorerItem(); f.setId(id); @@ -76,6 +78,7 @@ public class FileExplorerItemDTO implements Serializable { f.setHash(hash); f.setParentId(parentId != null && parentId > 0 ? parentId : null); f.setRoomId(roomId != null && roomId > 0 ? roomId : null); + f.setRoomId(groupId != null && groupId > 0 ? groupId : null); f.setOwnerId(ownerId != null && ownerId > 0 ? ownerId : null); f.setSize(size); f.setExternalId(externalId); @@ -85,11 +88,11 @@ public class FileExplorerItemDTO implements Serializable { f.setHeight(height); return f; } - + public Long getId() { return id; } - + public void setId(Long id) { this.id = id; } @@ -126,6 +129,14 @@ public class FileExplorerItemDTO implements Serializable { this.roomId = roomId; } + public Long getGroupId() { + return groupId; + } + + public void setGroupId(Long groupId) { + this.groupId = groupId; + } + public Long getOwnerId() { return ownerId; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java index c1a0888..950859b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlRootElement; import com.github.openjson.JSONObject; - @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class RoomOptionsDTO implements Serializable { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java index 0cfe6d5..41df977 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java @@ -20,12 +20,13 @@ package org.apache.openmeetings.db.dto.room; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import java.util.Collections; import java.util.Date; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -37,7 +38,7 @@ public class Whiteboard { private Integer y = 0; private Integer zoom = 100; private Boolean fullFit = true; - private Map<String, List<Object>> roomItems = new ConcurrentHashMap<>(); + private Map<String, List<Object>> roomItems = Collections.synchronizedMap(new LinkedHashMap<>()); private Date created = new Date(); private int zIndex = 1; private String name; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.html deleted file mode 100644 index 5f9cdd0..0000000 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.html +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. - ---> -<html xmlns:wicket="http://wicket.apache.org";> -<wicket:panel> - <form wicket:id="form"> - <span style="padding-left: 20px; padding-right: 20px;"><wicket:message key="572"/></span><input type="text" wicket:id="title"/> - <div wicket:id="feedback"></div> - <input type="submit" wicket:id="submit" class="invisible-form-component"/> - </form> -</wicket:panel> -</html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java deleted file mode 100644 index 022ac8d..0000000 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java +++ /dev/null @@ -1,107 +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.web.common; - -import java.util.Arrays; -import java.util.List; - -import org.apache.openmeetings.web.app.Application; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.form.AjaxButton; -import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.RequiredTextField; -import org.apache.wicket.markup.html.panel.FeedbackPanel; -import org.apache.wicket.model.Model; - -import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; - -public abstract class AddFolderDialog extends AbstractFormDialog<String> { - private static final long serialVersionUID = 1L; - private final DialogButton add = new DialogButton("add", Application.getString(1261)); - private final DialogButton cancel = new DialogButton("cancel", Application.getString(219)); - private final Form<String> form; - private final FeedbackPanel feedback = new FeedbackPanel("feedback"); - private final String name; - private RequiredTextField<String> title; - - public AddFolderDialog(String id) { - this(id, null); - } - - public AddFolderDialog(String id, String name) { - super(id, Application.getString(1260), Model.of(name)); - this.name = name; - form = new Form<String>("form", getModel()) { - private static final long serialVersionUID = 1L; - { - add(title = new RequiredTextField<>("title", getModel())); - title.setLabel(Model.of(Application.getString(572))); - add(feedback.setOutputMarkupId(true)); - add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected - private static final long serialVersionUID = 1L; - - @Override - protected void onSubmit(AjaxRequestTarget target) { - AddFolderDialog.this.onSubmit(target); - } - - @Override - protected void onError(AjaxRequestTarget target) { - AddFolderDialog.this.onError(target); - } - }); - } - }; - add(form.setOutputMarkupId(true)); - } - - @Override - protected void onOpen(IPartialPageRequestHandler handler) { - handler.add(form); - setModelObject(name); - getFeedbackMessages().clear(); - } - - @Override - protected void onSubmit(AjaxRequestTarget target) { - close(target, getSubmitButton()); - } - - @Override - protected List<DialogButton> getButtons() { - return Arrays.asList(add, cancel); - } - - @Override - public DialogButton getSubmitButton() { - return add; - } - - @Override - public Form<String> getForm() { - return form; - } - - @Override - protected void onError(AjaxRequestTarget target) { - target.add(feedback); - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html new file mode 100644 index 0000000..ef9e252 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. + +--> +<html xmlns:wicket="http://wicket.apache.org";> +<wicket:panel> + <form wicket:id="form"> + <label style="padding-left: 20px; padding-right: 20px;" wicket:id="label"></label><input type="text" wicket:id="title"/> + <div wicket:id="feedback"></div> + <input type="submit" wicket:id="submit" class="invisible-form-component"/> + </form> +</wicket:panel> +</html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java new file mode 100644 index 0000000..ab4c811 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java @@ -0,0 +1,125 @@ +/* + * 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.web.common; + +import java.util.Arrays; +import java.util.List; + +import org.apache.openmeetings.web.app.Application; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.form.AjaxButton; +import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.RequiredTextField; +import org.apache.wicket.model.Model; + +import com.googlecode.wicket.jquery.core.Options; +import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; +import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; + +public abstract class NameDialog extends AbstractFormDialog<String> { + private static final long serialVersionUID = 1L; + private final DialogButton add; + private final DialogButton cancel = new DialogButton("cancel", Application.getString(219)); + private final Form<String> form; + private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); + private final String name; + private RequiredTextField<String> title; + + public NameDialog(String id) { + this(id, null); + } + + public NameDialog(String id, String name) { + super(id, "", Model.of(name)); + this.name = name; + add = new DialogButton("add", getAddStr()); + form = new Form<>("form", getModel()); + } + + @Override + protected void onInitialize() { + super.onInitialize(); + setTitle(Model.of(getTitleStr())); + form.add(new Label("label", getLabelStr()) + , title = new RequiredTextField<>("title", getModel()) + , feedback.setOutputMarkupId(true) + , new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(AjaxRequestTarget target) { + NameDialog.this.onSubmit(target); + } + + @Override + protected void onError(AjaxRequestTarget target) { + NameDialog.this.onError(target); + } + }); + title.setLabel(Model.of(getLabelStr())); + add(form.setOutputMarkupId(true)); + } + + @Override + protected void onOpen(IPartialPageRequestHandler handler) { + handler.add(form); + setModelObject(name); + getFeedbackMessages().clear(); + } + + @Override + protected void onSubmit(AjaxRequestTarget target) { + close(target, getSubmitButton()); + } + + @Override + protected List<DialogButton> getButtons() { + return Arrays.asList(add, cancel); + } + + @Override + public DialogButton getSubmitButton() { + return add; + } + + @Override + public Form<String> getForm() { + return form; + } + + @Override + protected void onError(AjaxRequestTarget target) { + target.add(feedback); + } + + protected String getTitleStr() { + return getString("1260"); + } + + protected String getLabelStr() { + return getString("572"); + } + + protected String getAddStr() { + return Application.getString("1261"); + } +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java index a23cbd1..dff9122 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java @@ -38,7 +38,7 @@ import org.apache.openmeetings.db.entity.file.FileExplorerItem; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.file.FileItem.Type; import org.apache.openmeetings.db.entity.record.Recording; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog; import org.apache.openmeetings.web.util.AjaxDownload; @@ -91,7 +91,7 @@ public abstract class FileTreePanel extends Panel { } }; private final Form<Void> form = new Form<>("form"); - private final AddFolderDialog addFolder; + private final NameDialog addFolder; private final ConfirmableBorderDialog trashConfirm; private ConfirmableAjaxBorder trashBorder; private final Long roomId; @@ -106,7 +106,7 @@ public abstract class FileTreePanel extends Panel { }); private final Component upload = new WebMarkupContainer("upload"); - public FileTreePanel(String id, Long roomId, AddFolderDialog addFolder, ConfirmableBorderDialog trashConfirm) { + public FileTreePanel(String id, Long roomId, NameDialog addFolder, ConfirmableBorderDialog trashConfirm) { super(id); this.roomId = roomId; this.addFolder = addFolder; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java index c6aca8f..d215d71 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java @@ -26,7 +26,7 @@ import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dto.record.RecordingContainerData; import org.apache.openmeetings.db.entity.file.FileItem; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog; import org.apache.openmeetings.web.common.tree.FileTreePanel; import org.apache.openmeetings.web.room.RoomPanel; @@ -38,7 +38,7 @@ public class RoomFilePanel extends FileTreePanel { private static final long serialVersionUID = 1L; private final RoomPanel room; - public RoomFilePanel(String id, RoomPanel room, AddFolderDialog addFolder, ConfirmableBorderDialog trashConfirm) { + public RoomFilePanel(String id, RoomPanel room, NameDialog addFolder, ConfirmableBorderDialog trashConfirm) { super(id, room.getRoom().getId(), addFolder, trashConfirm); this.room = room; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index cb0e6a5..b09e688 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -34,7 +34,7 @@ import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.Room.Right; import org.apache.openmeetings.db.entity.room.Room.RoomElement; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog; import org.apache.openmeetings.web.room.RoomBroadcaster; @@ -97,7 +97,7 @@ public class RoomSidebar extends Panel { item.add(new RoomClientPanel("user", item, room)); } }; - private final AddFolderDialog addFolder = new AddFolderDialog("addFolder", Application.getString(712)) { + private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/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 bc68354..89a8a98 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 @@ -44,7 +44,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.UserContact; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.common.UserPanel; @@ -265,7 +265,7 @@ public class MessagesContactsPanel extends UserPanel { foldersModel.setObject(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE)); updateMoveModel(); - final AddFolderDialog addFolder = new AddFolderDialog("addFolder") { + final NameDialog addFolder = new NameDialog("addFolder") { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java index 9b3192c..4026398 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java @@ -26,7 +26,7 @@ import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dto.record.RecordingContainerData; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.UserPanel; import org.apache.openmeetings.web.common.tree.FileTreePanel; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -35,7 +35,7 @@ public class RecordingsPanel extends UserPanel { private static final long serialVersionUID = 1L; private final VideoPlayer video = new VideoPlayer("video"); private final VideoInfo info = new VideoInfo("info"); - private final AddFolderDialog addFolder = new AddFolderDialog("addFolder", Application.getString(712)) { + private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e78466d5/openmeetings-web/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 76b78d7..973ef1c 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -7,20 +7,20 @@ 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. - + --> -<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> +<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";> <context-param> <param-name>globalScope</param-name> <param-value>default</param-value>
