directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r497424 - in /directory/trunks/ldapstudio/ldapstudio-rcp: resources/icons/ src/main/java/org/apache/directory/ldapstudio/ src/main/java/org/apache/directory/ldapstudio/actions/ src/main/java/org/apache/directory/ldapstudio/view/ src/main/re...
Date Thu, 18 Jan 2007 13:05:47 GMT
Author: pamarcelot
Date: Thu Jan 18 05:05:46 2007
New Revision: 497424

URL: http://svn.apache.org/viewvc?view=rev&rev=497424
Log:
Renaming ManageExtensionsAction into ManageConfigurationAction. Adding the ReportABug Action.
Adding several icons.

Added:
    directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/about.png   (with props)
    directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/bug-report.png   (with props)
    directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/manage-configuration.png  
(with props)
    directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/search-updates.png   (with
props)
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageConfigurationAction.java
      - copied, changed from r497370, directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageExtensionsAction.java
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ReportABugAction.java
Removed:
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageExtensionsAction.java
Modified:
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java
    directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties

Added: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/about.png
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/about.png?view=auto&rev=497424
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/about.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/bug-report.png
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/bug-report.png?view=auto&rev=497424
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/bug-report.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/manage-configuration.png
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/manage-configuration.png?view=auto&rev=497424
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/manage-configuration.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/search-updates.png
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/search-updates.png?view=auto&rev=497424
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/ldapstudio/ldapstudio-rcp/resources/icons/search-updates.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java?view=diff&rev=497424&r1=497423&r2=497424
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java
Thu Jan 18 05:05:46 2007
@@ -22,8 +22,9 @@
 
 
 import org.apache.directory.ldapstudio.actions.AddExtensionAction;
-import org.apache.directory.ldapstudio.actions.ManageExtensionsAction;
+import org.apache.directory.ldapstudio.actions.ManageConfigurationAction;
 import org.apache.directory.ldapstudio.actions.OpenFileAction;
+import org.apache.directory.ldapstudio.actions.ReportABugAction;
 import org.apache.directory.ldapstudio.actions.UpdateAction;
 import org.apache.directory.ldapstudio.view.ImageKeys;
 import org.eclipse.jface.action.GroupMarker;
@@ -72,7 +73,7 @@
     private IWorkbenchAction helpAction;
     private UpdateAction updateAction;
     private AddExtensionAction addExtensionAction;
-    private ManageExtensionsAction manageExtensionsAction;
+    private ManageConfigurationAction manageConfigurationAction;
     private IWorkbenchAction newAction;
     private IWorkbenchAction importAction;
     private IWorkbenchAction exportAction;
@@ -90,7 +91,8 @@
     private IContributionItem perspectivesList;
     private IContributionItem viewsList;
     private IContributionItem reopenEditorsList;
-
+    private ReportABugAction reportABug;
+    
 
     /**
      * Creates a new instance of ApplicationActionBarAdvisor.
@@ -196,6 +198,8 @@
         register( closeAllPerspectivesAction );
         
         aboutAction = ActionFactory.ABOUT.create( window );
+        aboutAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
+            ImageKeys.ABOUT ) );
         register( aboutAction );
 
         preferencesAction = ActionFactory.PREFERENCES.create( window );
@@ -204,13 +208,17 @@
         register( preferencesAction );
 
         updateAction = new UpdateAction( window );
+        updateAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
+            ImageKeys.SEARCH_UPDATES ) );
         register( updateAction );
 
-        addExtensionAction = new AddExtensionAction( window );
-        register( addExtensionAction );
+//        addExtensionAction = new AddExtensionAction( window );
+//        register( addExtensionAction );
 
-        manageExtensionsAction = new ManageExtensionsAction( window );
-        register( manageExtensionsAction );
+        manageConfigurationAction = new ManageConfigurationAction( window );
+        manageConfigurationAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin(
Application.PLUGIN_ID,
+            ImageKeys.MANAGE_CONFIGURATION ) );
+        register( manageConfigurationAction );
 
         helpAction = ActionFactory.HELP_CONTENTS.create( window );
         register( helpAction );
@@ -218,6 +226,12 @@
         viewsList = ContributionItemFactory.VIEWS_SHORTLIST.create( window );
         perspectivesList = ContributionItemFactory.PERSPECTIVES_SHORTLIST.create( window
);
         reopenEditorsList = ContributionItemFactory.REOPEN_EDITORS.create( window );
+        
+        reportABug = new ReportABugAction( window );
+        reportABug.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
+            ImageKeys.REPORT_BUG ) );
+        register( reportABug );
+        
     }
 
 
@@ -301,12 +315,15 @@
 
         // Help
         helpMenu.add( helpAction );
+        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( updateAction );
-        softwareUpdates.add( addExtensionAction );
-        softwareUpdates.add( manageExtensionsAction );
+//        softwareUpdates.add( addExtensionAction );
+        softwareUpdates.add( manageConfigurationAction );
         helpMenu.add( softwareUpdates );
+        helpMenu.add( new Separator() );
         helpMenu.add( aboutAction );
     }
 

Copied: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageConfigurationAction.java
(from r497370, directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageExtensionsAction.java)
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageConfigurationAction.java?view=diff&rev=497424&p1=directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageExtensionsAction.java&r1=497370&p2=directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageConfigurationAction.java&r2=497424
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageExtensionsAction.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ManageConfigurationAction.java
Thu Jan 18 05:05:46 2007
@@ -30,14 +30,14 @@
 
 
 /**
- * This class implements the Manage Extensions Action.
+ * This class implements the Manage Configuration Action.
  * It uses Eclipse Plugin Manager to allow user to 
  * manager their plugin configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ManageExtensionsAction extends Action implements IAction
+public class ManageConfigurationAction extends Action implements IAction
 {
     private IWorkbenchWindow window;
 
@@ -47,12 +47,12 @@
      * @param window
      *          the window it is attached to
      */
-    public ManageExtensionsAction( IWorkbenchWindow window )
+    public ManageConfigurationAction( IWorkbenchWindow window )
     {
         this.window = window;
-        setId( "org.apache.directory.ldapstudio.manageExtensions" ); //$NON-NLS-1$
-        setText( Messages.getString( "ManageExtensionsAction.Manage_Extensions" ) ); //$NON-NLS-1$
-        setToolTipText( Messages.getString( "ManageExtensionsAction.Manage_extensions_for_LDAP_Studio"
) ); //$NON-NLS-1$
+        setId( "org.apache.directory.ldapstudio.manageConfiguration" ); //$NON-NLS-1$
+        setText( Messages.getString( "ManageConfigurationAction.Manage_Configuration" ) );
//$NON-NLS-1$
+        setToolTipText( Messages.getString( "ManageConfigurationAction.Manage_configuration_for_LDAP_Studio"
) ); //$NON-NLS-1$
     }
 
 

Added: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ReportABugAction.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ReportABugAction.java?view=auto&rev=497424
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ReportABugAction.java
(added)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/actions/ReportABugAction.java
Thu Jan 18 05:05:46 2007
@@ -0,0 +1,126 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.ldapstudio.actions;
+
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.directory.ldapstudio.Messages;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.PartInitException;
+
+
+/**
+ * The Action is used to open a browser that displays to page for opening a new Jira
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ReportABugAction extends Action implements IWorkbenchWindowActionDelegate
+{
+
+    /** The workbench window */
+    private IWorkbenchWindow workbenchWindow;
+
+
+    /**
+     * Creates a new instance of ReportABugAction.
+     */
+    public ReportABugAction()
+    {
+        setId( "org.apache.directory.ldapstudio.reportABug" ); //$NON-NLS-1$
+        setText( Messages.getString( "ReportABugAction.Report_a_bug" ) ); //$NON-NLS-1$
+        setToolTipText( Messages.getString( "ReportABugAction.Open_a_web_browser" ) ); //$NON-NLS-1$
+        setEnabled( true );
+    }
+
+
+    /**
+     * Creates a new instance of ReportABugAction.
+     *
+     * @param window the workbench window
+     */
+    public ReportABugAction( IWorkbenchWindow window )
+    {
+        this();
+        init( window );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void dispose()
+    {
+        workbenchWindow = null;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void init( IWorkbenchWindow window )
+    {
+        workbenchWindow = window;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void run( IAction action )
+    {
+        run();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void selectionChanged( IAction action, ISelection selection )
+    {
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void run()
+    {
+        try
+        {
+            workbenchWindow.getWorkbench().getBrowserSupport().getExternalBrowser().openURL(
+                new URL( Messages.getString("ReportABugAction.JIRA_URL") ) ); //$NON-NLS-1$
+        }
+        catch ( PartInitException e )
+        {
+        }
+        catch ( MalformedURLException e )
+        {
+        } 
+    }
+
+}
\ No newline at end of file

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java?view=diff&rev=497424&r1=497423&r2=497424
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/ImageKeys.java
Thu Jan 18 05:05:46 2007
@@ -31,4 +31,8 @@
 {
     // Images for Actions
     public static final String SHOW_PREFERENCES = "resources/icons/preferences.png"; //$NON-NLS-1$
+    public static final String ABOUT = "resources/icons/about.png"; //$NON-NLS-1$
+    public static final String REPORT_BUG = "resources/icons/bug-report.png"; //$NON-NLS-1$
+    public static final String SEARCH_UPDATES = "resources/icons/search-updates.png"; //$NON-NLS-1$
+    public static final String MANAGE_CONFIGURATION = "resources/icons/manage-configuration.png";
//$NON-NLS-1$
 }

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java?view=diff&rev=497424&r1=497423&r2=497424
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java
(original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/view/Perspective.java
Thu Jan 18 05:05:46 2007
@@ -47,6 +47,8 @@
 
         layout.addPerspectiveShortcut( "org.apache.directory.ldapstudio.browser.ui.perspective.BrowserPerspective"
); //$NON-NLS-1$
         layout.addPerspectiveShortcut( "org.apache.directory.ldapstudio.schemas.perspective"
); //$NON-NLS-1$ 
+    
+        layout.addShowViewShortcut( WelcomeView.ID );
     }
 
 }

Modified: directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties?view=diff&rev=497424&r1=497423&r2=497424
==============================================================================
--- directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
(original)
+++ directory/trunks/ldapstudio/ldapstudio-rcp/src/main/resources/org/apache/directory/ldapstudio/messages.properties
Thu Jan 18 05:05:46 2007
@@ -31,9 +31,9 @@
 AddExtensionAction.LDAP_Studio_Site=LDAP Studio Site
 AddExtensionAction.LDAP_Studio_Home_Base=http://people.apache.org/~pamarcelot/ldapstudio/update
 
-# Strings used by ManageExtensionsAction Class
-ManageExtensionsAction.Manage_Extensions=Manage Extensions
-ManageExtensionsAction.Manage_extensions_for_LDAP_Studio=Manage extensions for LDAP Studio
+# Strings used by ManageConfigurationAction Class
+ManageConfigurationAction.Manage_Configuration=Manage Configuration
+ManageConfigurationAction.Manage_configuration_for_LDAP_Studio=Manage configuration for LDAP
Studio
 
 # Strings used by UpdateAction Class
 UpdateAction.Search_for_updates=Search for updates
@@ -56,3 +56,8 @@
 OpenFileAction.File_x_does_not_exist=File {0} doesn't exist.
 OpenFileAction.File_x_is_not_readable=File {0} isn't readable.
 OpenFileAction.No_appropriate_editor_found_for_x=No appropriate editor found for {0}.
+
+# Strings used by ReportABugAction Class
+ReportABugAction.Report_a_bug=Report a bug...
+ReportABugAction.Open_a_web_browser=Open a Web browser for creating a new bug report
+ReportABugAction.JIRA_URL=https://issues.apache.org/jira/browse/DIRSTUDIO



Mime
View raw message