You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/08/17 16:14:29 UTC
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...
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 <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-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
}
} );
}