From: <rob...@us...> - 2010-07-27 09:20:26
|
Revision: 13809 http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13809&view=rev Author: robertdavid Date: 2010-07-27 09:20:19 +0000 (Tue, 27 Jul 2010) Log Message: ----------- [#WEB-150] Consistent Create/Add/Edit as Modal Windows - AE Management Modified Paths: -------------- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/CreateOrEditAETPage.java Removed Paths: ------------- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEMgtPanel.java Deleted: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEMgtPanel.java =================================================================== --- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEMgtPanel.java 2010-07-27 08:13:04 UTC (rev 13808) +++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEMgtPanel.java 2010-07-27 09:20:19 UTC (rev 13809) @@ -1,79 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (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.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is part of dcm4che, an implementation of DICOM(TM) in - * Java(TM), hosted at http://sourceforge.net/projects/dcm4che. - * - * The Initial Developer of the Original Code is - * Agfa-Gevaert AG. - * Portions created by the Initial Developer are Copyright (C) 2008 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * See listed authors below. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -package org.dcm4chee.web.war.ae; - -import org.apache.wicket.markup.html.panel.Panel; - -/** - * @author Gunter Zeilinger <gun...@gm...> - * @version $Revision$ $Date$ - * @since Jan 5, 2009 - */ -public class AEMgtPanel extends Panel { - - private static final long serialVersionUID = 1L; - - // private EditAETPanel editPanel; - private AEListPanel listPanel; - - public AEMgtPanel(final String id) { - super(id); -// add(CSSPackageResource.getHeaderContribution(BaseWicketPage.class, "base-style.css")); -// AEMgtDelegate.getInstance().updateAEList(); -// if ( listPanel == null ) { -// listPanel = new AEListPanel("ae_panel"); -// } -// this.addOrReplace( editMode ? editPanel : listPanel); -// this.addOrReplace(listPanel); - } - -// public void setEditPage(AE ae) { -// editMode = true; -// editPanel = new EditAETPanel("ae_panel", this, ae); -// this.addOrReplace(editPanel); -// } - - public void setListPage() { - addOrReplace(listPanel); -} - - public static String getModuleName() { - return "aet"; - } -} Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/CreateOrEditAETPage.java =================================================================== --- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/CreateOrEditAETPage.java 2010-07-27 08:13:04 UTC (rev 13808) +++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/CreateOrEditAETPage.java 2010-07-27 09:20:19 UTC (rev 13809) @@ -138,18 +138,15 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) { try { ((AEHomeLocal) JNDIUtils.lookup(AEHomeLocal.JNDI_NAME)).updateOrCreateAET(ae); - resultMessage.setObject(""); window.close(target); } catch (Exception e) { resultMessage.setObject(e.getLocalizedMessage()); - } finally { target.addComponent(CreateOrEditAETPage.this); } } @Override protected void onError(AjaxRequestTarget target, Form<?> form) { -// form.setOutputMarkupId(true); target.addComponent(form); } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |