Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CE8A217E25 for ; Fri, 3 Apr 2015 17:11:19 +0000 (UTC) Received: (qmail 46022 invoked by uid 500); 3 Apr 2015 17:11:19 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 45982 invoked by uid 500); 3 Apr 2015 17:11:19 -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 45973 invoked by uid 99); 3 Apr 2015 17:11:19 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2015 17:11:19 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 218AAAC012B for ; Fri, 3 Apr 2015 17:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1671102 - in /directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio: ./ actions/ Date: Fri, 03 Apr 2015 17:11:19 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150403171119.218AAAC012B@hades.apache.org> Author: seelmann Date: Fri Apr 3 17:11:18 2015 New Revision: 1671102 URL: http://svn.apache.org/r1671102 Log: Delete actions which implemented old update mechanism from org.eclipse.update (DIRSTUDIO-1007) Removed: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java?rev=1671102&r1=1671101&r2=1671102&view=diff ============================================================================== --- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java (original) +++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java Fri Apr 3 17:11:18 2015 @@ -21,11 +21,8 @@ package org.apache.directory.studio; -import org.apache.directory.studio.actions.AddExtensionAction; -import org.apache.directory.studio.actions.ManageConfigurationAction; import org.apache.directory.studio.actions.OpenFileAction; import org.apache.directory.studio.actions.ReportABugAction; -import org.apache.directory.studio.actions.UpdateAction; import org.apache.directory.studio.view.ImageKeys; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.GroupMarker; @@ -74,8 +71,6 @@ public class ApplicationActionBarAdvisor private IWorkbenchAction preferencesAction; private IWorkbenchAction helpAction; private IWorkbenchAction dynamicHelpAction; - private UpdateAction updateAction; - private ManageConfigurationAction manageConfigurationAction; private IWorkbenchAction newAction; private IWorkbenchAction newDropDownAction; private IWorkbenchAction importAction; @@ -100,7 +95,6 @@ public class ApplicationActionBarAdvisor private IWorkbenchAction nextAction; private IWorkbenchAction previousAction; private IWorkbenchAction introAction; - private AddExtensionAction addExtensionAction; /** @@ -219,19 +213,6 @@ public class ApplicationActionBarAdvisor ImageKeys.SHOW_PREFERENCES ) ); register( preferencesAction ); - updateAction = new UpdateAction( window ); - updateAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, - ImageKeys.SEARCH_UPDATES ) ); - register( updateAction ); - - addExtensionAction = new AddExtensionAction( window ); - register( addExtensionAction ); - - manageConfigurationAction = new ManageConfigurationAction( window ); - manageConfigurationAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( - Application.PLUGIN_ID, ImageKeys.MANAGE_CONFIGURATION ) ); - register( manageConfigurationAction ); - helpAction = ActionFactory.HELP_CONTENTS.create( window ); register( helpAction ); @@ -391,13 +372,7 @@ public class ApplicationActionBarAdvisor helpMenu.add( dynamicHelpAction ); helpMenu.add( new Separator() ); helpMenu.add( reportABug ); - helpMenu.add( new Separator() ); - MenuManager softwareUpdates = new MenuManager( Messages - .getString( "ApplicationActionBarAdvisor.Software_Updates" ), "softwareUpdates" ); //$NON-NLS-1$ //$NON-NLS-2$ - softwareUpdates.add( addExtensionAction ); - softwareUpdates.add( updateAction ); - softwareUpdates.add( manageConfigurationAction ); - helpMenu.add( softwareUpdates ); + helpMenu.add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) ); if ( ApplicationActionBarAdvisor.OS_MACOSX.equalsIgnoreCase( os ) ) { // We hide the about action, it will be added by the "Carbon" plugin Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties?rev=1671102&r1=1671101&r2=1671102&view=diff ============================================================================== --- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties (original) +++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties Fri Apr 3 17:11:18 2015 @@ -21,7 +21,6 @@ # # Strings used by ApplicationActionBarAdvisor Class -ApplicationActionBarAdvisor.Software_Updates=Software Updates ApplicationActionBarAdvisor.edit=&Edit ApplicationActionBarAdvisor.showView=Show View ApplicationActionBarAdvisor.windows=&Window @@ -31,22 +30,6 @@ ApplicationActionBarAdvisor.navigate=&Na ApplicationActionBarAdvisor.new=New... ApplicationActionBarAdvisor.openPerspective=Open Perspective -# Strings used by AddExtensionAction Class -AddExtensionAction.Add_Extensions=Add Extensions -AddExtensionAction.Search_for_new_extensions=Search for new extensions for Apache Directory Studio -AddExtensionAction.Searching_new_extensions=Searching new extensions -AddExtensionAction.Apache_Directory_Studio_Site=Apache Directory Studio -AddExtensionAction.Apache_Directory_Studio_Home_Base=http://directory.apache.org/studio/update/2.x - -# Strings used by ManageConfigurationAction Class -ManageConfigurationAction.Manage_Configuration=Manage Configuration -ManageConfigurationAction.Manage_configuration_for_LDAP_Studio=Manage configuration for Apache Directory Studio - -# Strings used by UpdateAction Class -UpdateAction.Search_for_updates=Search for updates... -UpdateAction.Search_for_updates_for_LDAP_Studio=Search for updates for Apache Directory Studio -UpdateAction.Searching_for_updates=Searching for updates - # Strings used by OpenFileAction Class OpenFileAction.Open_File=Open File... OpenFileAction.Open_file_from_filesystem=Open file from filesystem Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties?rev=1671102&r1=1671101&r2=1671102&view=diff ============================================================================== --- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties (original) +++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties Fri Apr 3 17:11:18 2015 @@ -21,7 +21,6 @@ # # Strings used by ApplicationActionBarAdvisor Class -ApplicationActionBarAdvisor.Software_Updates=Software Updates ApplicationActionBarAdvisor.edit=&Bearbeiten ApplicationActionBarAdvisor.showView=Zeige Ansicht ApplicationActionBarAdvisor.windows=&Fenster Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties?rev=1671102&r1=1671101&r2=1671102&view=diff ============================================================================== --- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties (original) +++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties Fri Apr 3 17:11:18 2015 @@ -21,7 +21,6 @@ # # Strings used by ApplicationActionBarAdvisor Class -ApplicationActionBarAdvisor.Software_Updates=Mises \u00E0 jour ApplicationActionBarAdvisor.edit=&Edition ApplicationActionBarAdvisor.showView=Afficher la vue ApplicationActionBarAdvisor.windows=&Fen\u00EAtre