Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 92407 invoked from network); 17 Aug 2010 14:15:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Aug 2010 14:15:50 -0000 Received: (qmail 75498 invoked by uid 500); 17 Aug 2010 14:15:50 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 75437 invoked by uid 500); 17 Aug 2010 14:15:48 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 75429 invoked by uid 99); 17 Aug 2010 14:15:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Aug 2010 14:15:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Aug 2010 14:15:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E402A2388A44; Tue, 17 Aug 2010 14:14:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r986317 - in /directory/studio/trunk/plugins: common.ui/src/main/java/org/apache/directory/studio/common/ui/ ldapservers/src/main/java/org/apache/directory/studio/ldapservers/ ldapservers/src/main/java/org/apache/directory/studio/ldapserver... Date: Tue, 17 Aug 2010 14:14:29 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100817141429.E402A2388A44@eris.apache.org> Author: pamarcelot Date: Tue Aug 17 14:14:29 2010 New Revision: 986317 URL: http://svn.apache.org/viewvc?rev=986317&view=rev Log: Renamed 'CommonUiUtils' as 'CommonUIUtils'. Added: directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java - copied, changed from r986306, directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUiUtils.java Removed: directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUiUtils.java Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/UnknownLdapServerAdapterExtension.java Copied: directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java (from r986306, directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUiUtils.java) URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java?p2=directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java&p1=directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUiUtils.java&r1=986306&r2=986317&rev=986317&view=diff ============================================================================== --- directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUiUtils.java (original) +++ directory/studio/trunk/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIUtils.java Tue Aug 17 14:14:29 2010 @@ -30,7 +30,7 @@ import org.eclipse.ui.PlatformUI; * * @author Apache Directory Project */ -public class CommonUiUtils +public class CommonUIUtils { /** * Reports an error. Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java?rev=986317&r1=986316&r2=986317&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java (original) +++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java Tue Aug 17 14:14:29 2010 @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; -import org.apache.directory.studio.common.ui.CommonUiUtils; +import org.apache.directory.studio.common.ui.CommonUIUtils; import org.apache.directory.studio.ldapservers.model.LdapServer; import org.eclipse.core.runtime.IPath; import org.eclipse.ui.IMemento; @@ -276,13 +276,13 @@ public class LdapServersManager } catch ( Exception e ) { - CommonUiUtils.reportError( Messages.getString( "LdapServersManager.ErrorLoadingServer" ) //$NON-NLS-1$ + CommonUIUtils.reportError( Messages.getString( "LdapServersManager.ErrorLoadingServer" ) //$NON-NLS-1$ + e.getMessage() ); } } else { - CommonUiUtils.reportError( Messages.getString( "LdapServersManager.ErrorLoadingServer" ) //$NON-NLS-1$ + CommonUIUtils.reportError( Messages.getString( "LdapServersManager.ErrorLoadingServer" ) //$NON-NLS-1$ + exceptionMessage ); } } @@ -328,7 +328,7 @@ public class LdapServersManager } catch ( Exception e ) { - CommonUiUtils + CommonUIUtils .reportError( Messages.getString( "LdapServersManager.ErrorLoadingServer" ) + e.getMessage() ); //$NON-NLS-1$ } } Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java?rev=986317&r1=986316&r2=986317&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java (original) +++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java Tue Aug 17 14:14:29 2010 @@ -30,7 +30,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.apache.directory.studio.common.ui.CommonUiUtils; +import org.apache.directory.studio.common.ui.CommonUIUtils; import org.apache.directory.studio.ldapservers.model.LdapServer; import org.apache.directory.studio.ldapservers.model.LdapServerStatus; import org.apache.mina.util.AvailablePortFinder; @@ -328,7 +328,7 @@ public class LdapServersUtils } catch ( IOException e ) { - CommonUiUtils.reportError( "An error occurred when copying the library '" + library + CommonUIUtils.reportError( "An error occurred when copying the library '" + library + "' to the location '" + destinationLibraryFile.getAbsolutePath() + "'.\n\n" + e.getMessage() ); } } Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/UnknownLdapServerAdapterExtension.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/UnknownLdapServerAdapterExtension.java?rev=986317&r1=986316&r2=986317&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/UnknownLdapServerAdapterExtension.java (original) +++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/UnknownLdapServerAdapterExtension.java Tue Aug 17 14:14:29 2010 @@ -22,9 +22,12 @@ package org.apache.directory.studio.ldap import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; -import org.apache.directory.studio.common.ui.CommonUiUtils; +import org.apache.directory.studio.common.ui.CommonUIUtils; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PlatformUI; /** @@ -70,7 +73,7 @@ public class UnknownLdapServerAdapterExt { public void run() { - CommonUiUtils.reportError( "test" ); + // TODO } } ); }