directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r985167 - in /directory/studio/trunk/apacheds: plugin.properties pom.xml src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java
Date Fri, 13 Aug 2010 11:58:00 GMT
Author: pamarcelot
Date: Fri Aug 13 11:58:00 2010
New Revision: 985167

URL: http://svn.apache.org/viewvc?rev=985167&view=rev
Log:
Removed usage of the deleted 'jars' plugin.

Modified:
    directory/studio/trunk/apacheds/plugin.properties
    directory/studio/trunk/apacheds/pom.xml
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java

Modified: directory/studio/trunk/apacheds/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.properties?rev=985167&r1=985166&r2=985167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.properties (original)
+++ directory/studio/trunk/apacheds/plugin.properties Fri Aug 13 11:58:00 2010
@@ -83,7 +83,6 @@ Plugin_LdapBrowserCore_id=org.apache.dir
 Plugin_LdapBrowserUi_id=org.apache.directory.studio.ldapbrowser.ui
 Plugin_LdifEditor_id=org.apache.directory.studio.ldifeditor
 Plugin_LdifParser_id=org.apache.directory.studio.ldifparser
-Plugin_Jars_id=org.apache.directory.studio.jars
 
 Perspective_LdapBrowserPerspective_id=org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective
 

Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=985167&r1=985166&r2=985167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Fri Aug 13 11:58:00 2010
@@ -108,7 +108,6 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.apacheds.ApacheDsPlugin</Bundle-Activator>
-            <Eclipse-RegisterBuddy>org.apache.directory.studio.jars</Eclipse-RegisterBuddy>
             <Require-Bundle>
  org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
  org.apache.directory.studio.apacheds.configuration,

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java?rev=985167&r1=985166&r2=985167&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionAction.java
Fri Aug 13 11:58:00 2010
@@ -141,8 +141,8 @@ public class CreateConnectionAction exte
                 else
                 {
                     // LDAP and LDAPS protocols are disabled, we report this error to the
user
-                    MessageDialog dialog = new MessageDialog( view.getSite().getShell(),
Messages
-                        .getString( "CreateConnectionAction.UnableCreateConnection" ), null,
//$NON-NLS-1$
+                    MessageDialog dialog = new MessageDialog( view.getSite().getShell(),
+                        Messages.getString( "CreateConnectionAction.UnableCreateConnection"
), null, //$NON-NLS-1$
                         Messages.getString( "CreateConnectionAction.LDAPAndLDAPSDisabled"
), MessageDialog.ERROR, //$NON-NLS-1$
                         new String[]
                             { IDialogConstants.OK_LABEL }, MessageDialog.OK );
@@ -175,8 +175,8 @@ public class CreateConnectionAction exte
                 + Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) +
errorMessage; //$NON-NLS-1$
         }
 
-        MessageDialog dialog = new MessageDialog( view.getSite().getShell(), Messages
-            .getString( "CreateConnectionAction.UnableReadServerConfiguration" ), //$NON-NLS-1$
+        MessageDialog dialog = new MessageDialog( view.getSite().getShell(),
+            Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ),
//$NON-NLS-1$
             null, message, MessageDialog.ERROR, new String[]
                 { IDialogConstants.OK_LABEL }, MessageDialog.OK );
         dialog.open();
@@ -339,18 +339,7 @@ public class CreateConnectionAction exte
                                         return false;
                                     }
 
-                                    // Jars Plugin
-                                    Bundle jarsBundle = Platform.getBundle( properties.getString(
"Plugin_Jars_id" ) ); //$NON-NLS-1$
-                                    if ( jarsBundle != null )
-                                    {
-                                        // Checking the state of the plugin
-                                        if ( jarsBundle.getState() == Bundle.UNINSTALLED
)
-                                        {
-                                            return false;
-                                        }
-
-                                        return true;
-                                    }
+                                    return true;
                                 }
                             }
                         }



Mime
View raw message