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 517659B3A for ; Mon, 13 Feb 2012 18:41:49 +0000 (UTC) Received: (qmail 26383 invoked by uid 500); 13 Feb 2012 18:41:49 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 26315 invoked by uid 500); 13 Feb 2012 18:41: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 26308 invoked by uid 99); 13 Feb 2012 18:41:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Feb 2012 18:41:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 13 Feb 2012 18:41:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CFC723888E4 for ; Mon, 13 Feb 2012 18:41:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1243644 - /directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/ Date: Mon, 13 Feb 2012 18:41:25 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120213184126.3CFC723888E4@eris.apache.org> Author: pamarcelot Date: Mon Feb 13 18:41:25 2012 New Revision: 1243644 URL: http://svn.apache.org/viewvc?rev=1243644&view=rev Log: Fix for DIRSTUDIO-713 (Improve the 'Show in' sub-menu of the TableEntryEditor). Added: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java?rev=1243644&r1=1243643&r2=1243644&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java Mon Feb 13 18:41:25 2012 @@ -31,7 +31,6 @@ import org.apache.directory.studio.ldapb import org.apache.directory.studio.ldapbrowser.core.model.IEntry; import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; -import org.apache.directory.studio.ldapbrowser.ui.views.browser.BrowserView; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.viewers.ISelection; @@ -50,9 +49,6 @@ import org.eclipse.ui.IShowEditorInput; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.EditorPart; -import org.eclipse.ui.part.IShowInSource; -import org.eclipse.ui.part.IShowInTargetList; -import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; @@ -187,30 +183,6 @@ public abstract class EntryEditor extend return outlinePage; } - if ( IShowInTargetList.class.equals( required ) ) - { - return new IShowInTargetList() - { - public String[] getShowInTargetIds() - { - return new String[] - { BrowserView.getId() }; - } - }; - } - - if ( IShowInSource.class.equals( required ) ) - { - return new IShowInSource() - { - public ShowInContext getShowInContext() - { - return new ShowInContext( getMainWidget().getViewer().getInput(), getMainWidget().getViewer() - .getSelection() ); - } - }; - } - return super.getAdapter( required ); } Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java?rev=1243644&r1=1243643&r2=1243644&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java Mon Feb 13 18:41:25 2012 @@ -53,9 +53,7 @@ import org.eclipse.jface.action.MenuMana import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; -import org.eclipse.ui.actions.ContributionItemFactory; /** @@ -80,6 +78,9 @@ public class EntryEditorActionGroup exte /** The expand all action. */ private ExpandAllAction expandAllAction; + + /** The 'Show In' menu manager */ + private EntryEditorShowInMenuManager showInMenuManager; /** The Constant editAttributeDescriptionAction. */ private static final String editAttributeDescriptionAction = "editAttributeDescriptionAction"; //$NON-NLS-1$ @@ -183,6 +184,7 @@ public class EntryEditorActionGroup exte openEntryEditorPreferencePage = new OpenEntryEditorPreferencePageAction(); collapseAllAction = new CollapseAllAction( viewer ); expandAllAction = new ExpandAllAction( viewer ); + showInMenuManager = new EntryEditorShowInMenuManager( entryEditor ); entryEditorActionMap.put( editAttributeDescriptionAction, new EntryEditorActionProxy( viewer, new EditAttributeDescriptionAction( viewer ) ) ); @@ -239,7 +241,6 @@ public class EntryEditorActionGroup exte entryEditorActionMap.put( propertyDialogAction, new EntryEditorActionProxy( viewer, new EntryEditorPropertiesAction( entryEditor ) ) ); - } @@ -336,11 +337,7 @@ public class EntryEditorActionGroup exte schemaMenuManager.add( entryEditorActionMap.get( showOrderingMrdAction ) ); schemaMenuManager.add( entryEditorActionMap.get( showLsdAction ) ); menuManager.add( schemaMenuManager ); - MenuManager showInSubMenu = new MenuManager( Messages.getString( "EntryEditorActionGroup.ShowIn" ) ); //$NON-NLS-1$ - showInSubMenu.add( ContributionItemFactory.VIEWS_SHOW_IN.create( PlatformUI.getWorkbench() - .getActiveWorkbenchWindow() ) ); - menuManager.add( showInSubMenu ); - + showInMenuManager.createMenuManager( menuManager ); menuManager.add( new Separator() ); // copy, paste, delete Added: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java?rev=1243644&view=auto ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java (added) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java Mon Feb 13 18:41:25 2012 @@ -0,0 +1,124 @@ +/* + * 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.studio.ldapbrowser.ui.editors.entry; + + +import org.apache.directory.studio.entryeditors.EntryEditorInput; +import org.apache.directory.studio.ldapbrowser.core.model.IBookmark; +import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.actions.ContributionItemFactory; + + +/** + * The EntryEditorShowInMenuManager manages actions for the "Show In" menu manager. + * + * @author Apache Directory Project + */ +public class EntryEditorShowInMenuManager +{ + /** The entry editor */ + private EntryEditor entryEditor; + + /** The locate entry in DIT action */ + private LocateEntryInLdapBrowserAction locateEntryInDitAction; + + /** The locate search result or bookmark action */ + private LocateSearchResultOrBookmarkAction locateSearchResultOrBookmarkAction; + + + /** + * Creates a new instance of EntryEditorShowInMenuManager. + * + * @param entryEditor the entry editor + */ + public EntryEditorShowInMenuManager( EntryEditor entryEditor ) + { + this.entryEditor = entryEditor; + + locateEntryInDitAction = new LocateEntryInLdapBrowserAction( entryEditor, this ); + locateSearchResultOrBookmarkAction = new LocateSearchResultOrBookmarkAction( entryEditor, this ); + } + + + /** + * Creates the menu manager. + * + * @param parent parent menu manager + */ + public void createMenuManager( IMenuManager parent ) + { + MenuManager showInMenuManager = new MenuManager( Messages.getString( "EntryEditorShowInMenuManager.ShowIn" ) ); //$NON-NLS-1$ + parent.add( showInMenuManager ); + + Object input = getInput(); + + if ( input != null ) + { + showInMenuManager.add( locateEntryInDitAction ); + + if ( inputIsSearchResultOrBookmark() ) + { + showInMenuManager.add( locateSearchResultOrBookmarkAction ); + } + } + + showInMenuManager.add( ContributionItemFactory.VIEWS_SHOW_IN.create( PlatformUI.getWorkbench() + .getActiveWorkbenchWindow() ) ); + } + + + /** + * Gets the input. + * + * @return the input + */ + public Object getInput() + { + if ( entryEditor != null ) + { + EntryEditorInput editorInput = entryEditor.getEntryEditorInput(); + + if ( editorInput != null ) + { + return editorInput.getInput(); + } + } + + return null; + } + + + /** + * Indicates if the input is a search result or a bookmark. + * + * @return true if the input is a search result or a bookmark, + * false if not. + */ + private boolean inputIsSearchResultOrBookmark() + { + Object input = getInput(); + + return ( ( input instanceof ISearchResult ) || ( input instanceof IBookmark ) ); + } +} Added: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java?rev=1243644&view=auto ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java (added) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java Mon Feb 13 18:41:25 2012 @@ -0,0 +1,143 @@ +/* + * 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.studio.ldapbrowser.ui.editors.entry; + + +import org.apache.directory.studio.entryeditors.EntryEditorInput; +import org.apache.directory.studio.ldapbrowser.core.model.IEntry; +import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; +import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin; +import org.apache.directory.studio.ldapbrowser.ui.views.browser.BrowserView; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; + + +/** + * This action is used to locate the input entry in the LDAP Browser DIT. + * + * @author Apache Directory Project + */ +public class LocateEntryInLdapBrowserAction extends Action +{ + /** The entry editor */ + protected EntryEditor entryEditor; + + /** The menu manager */ + protected EntryEditorShowInMenuManager showInMenuManager; + + + /** + * Creates a new instance of LocateEntryInLdapBrowserAction. + * + * @param entryEditor the entry editor + * @param showInMenuManager the menu manager + */ + public LocateEntryInLdapBrowserAction( EntryEditor entryEditor, EntryEditorShowInMenuManager showInMenuManager ) + { + super(); + this.entryEditor = entryEditor; + this.showInMenuManager = showInMenuManager; + } + + + /** + * {@inheritDoc} + */ + public void run() + { + if ( entryEditor != null ) + { + EntryEditorInput editorInput = entryEditor.getEntryEditorInput(); + + if ( editorInput != null ) + { + IEntry entry = editorInput.getResolvedEntry(); + + if ( entry != null ) + { + select( entry ); + } + } + } + } + + + /** + * Select the object in the LDAP Browser. + * + * @param o the object + */ + protected void select( Object o ) + { + String targetId = BrowserView.getId(); + IViewPart targetView = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView( + targetId ); + + if ( targetView == null ) + { + try + { + targetView = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView( + targetId, null, IWorkbenchPage.VIEW_ACTIVATE ); + } + catch ( PartInitException e ) + { + } + } + + if ( targetView != null && targetView instanceof BrowserView ) + { + ( ( BrowserView ) targetView ).select( o ); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate( targetView ); + } + } + + + /** + * {@inheritDoc} + */ + public String getText() + { + return Messages.getString( "LocateEntryInLdapBrowserAction.LDAPBrowser" ); //$NON-NLS-1$ + } + + + /** + * {@inheritDoc} + */ + public String getToolTipText() + { + return getText(); + } + + + /** + * {@inheritDoc} + */ + public ImageDescriptor getImageDescriptor() + { + return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_LOCATE_ENTRY_IN_DIT ); + } +} Added: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java?rev=1243644&view=auto ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java (added) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java Mon Feb 13 18:41:25 2012 @@ -0,0 +1,110 @@ +/* + * 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.studio.ldapbrowser.ui.editors.entry; + + +import org.apache.directory.studio.ldapbrowser.core.model.IBookmark; +import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult; +import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; +import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin; +import org.eclipse.jface.resource.ImageDescriptor; + + +/** + * This action is used to locate the search result or bookmark in the LDAP Browser view. + * + * @author Apache Directory Project + */ +public class LocateSearchResultOrBookmarkAction extends LocateEntryInLdapBrowserAction +{ + /** + * Creates a new instance of LocateSearchResultOrBookmarkAction. + * + * @param entryEditor the entry editor + * @param showInMenuManager the menu manager + */ + public LocateSearchResultOrBookmarkAction( EntryEditor entryEditor, EntryEditorShowInMenuManager showInMenuManager ) + { + super( entryEditor, showInMenuManager ); + } + + + /** + * {@inheritDoc} + */ + public void run() + { + Object input = showInMenuManager.getInput(); + + if ( input != null ) + { + select( input ); + } + } + + + /** + * {@inheritDoc} + */ + public String getText() + { + Object input = showInMenuManager.getInput(); + + if ( input != null ) + { + if ( input instanceof ISearchResult ) + { + return Messages.getString( "LocateSearchResultOrBookmarkAction.Searches" ); //$NON-NLS-1$ + } + else if ( input instanceof IBookmark ) + { + return Messages.getString( "LocateSearchResultOrBookmarkAction.Bookmarks" ); //$NON-NLS-1$ + } + } + + return super.getText(); + } + + + /** + * {@inheritDoc} + */ + public ImageDescriptor getImageDescriptor() + { + Object input = showInMenuManager.getInput(); + + if ( input != null ) + { + if ( input instanceof ISearchResult ) + { + return BrowserUIPlugin.getDefault().getImageDescriptor( + BrowserUIConstants.IMG_LOCATE_SEARCHRESULT_IN_DIT ); + } + else if ( input instanceof IBookmark ) + { + return BrowserUIPlugin.getDefault().getImageDescriptor( + BrowserUIConstants.IMG_LOCATE_BOOKMARK_IN_DIT ); + } + } + + return super.getImageDescriptor(); + } +} Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties?rev=1243644&r1=1243643&r2=1243644&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties Mon Feb 13 18:41:25 2012 @@ -18,11 +18,14 @@ ToggleAutosaveAction.Autosave=Save Automatically EntryEditorActionGroup.Advanced=Advanced EntryEditorActionGroup.OpenSchemaBrowser=Open Schema Browser -EntryEditorActionGroup.ShowIn=Show In +EntryEditorShowInMenuManager.ShowIn=Show In LdifEntryEditorDocumentProvider.InvalidDN=Invalid Distinguished Name. LdifEntryEditorDocumentProvider.InvalidLdif=Invalid LDIF: {0} LdifEntryEditorDocumentProvider.InvalidRecordType=Exactly one LDIF content record expected. LdifEntryEditorDocumentProvider.ModDnNotSupported=Modification of Distinguished Name is not supported by the LDIF Entry Editor. +LocateEntryInLdapBrowserAction.LDAPBrowser=LDAP Browser +LocateSearchResultOrBookmarkAction.Bookmarks=Bookmarks +LocateSearchResultOrBookmarkAction.Searches=Searches OpenEntryEditorAction.EditEntry=Edit Entry... OpenEntryEditorPreferencePageAction.Preferences=Preferences... OpenEntryEditorPreferencePageAction.PreferencesToolTip=Preferences... Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties?rev=1243644&r1=1243643&r2=1243644&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties Mon Feb 13 18:41:25 2012 @@ -18,11 +18,13 @@ ToggleAutosaveAction.Autosave=Automatisch speichern EntryEditorActionGroup.Advanced=Erweitert EntryEditorActionGroup.OpenSchemaBrowser=\u00D6ffne Schema Browser -EntryEditorActionGroup.ShowIn=Anzeigen in +EntryEditorShowInMenuManager.ShowIn=Anzeigen in LdifEntryEditorDocumentProvider.InvalidDN=Ung\u00fcltiger Distinguished Name. LdifEntryEditorDocumentProvider.InvalidLdif=Ung\u00fcltiges LDIF: {0} LdifEntryEditorDocumentProvider.InvalidRecordType=Genau ein LDIF Inhaltsdatensatz erwartet. LdifEntryEditorDocumentProvider.ModDnNotSupported=\u00c4nderung des Distinguished Name wird vom LDIF-Eintrags-Editor nicht unterst\u00fctzt. +LocateSearchResultOrBookmarkAction.Bookmarks=Lesezeichen +LocateSearchResultOrBookmarkAction.Searches=Suchen OpenEntryEditorAction.EditEntry=Eintrag bearbeiten... OpenEntryEditorPreferencePageAction.Preferences=Benutzervorgaben... OpenEntryEditorPreferencePageAction.PreferencesToolTip=Benutzervorgaben... Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties?rev=1243644&r1=1243643&r2=1243644&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties Mon Feb 13 18:41:25 2012 @@ -18,11 +18,14 @@ ToggleAutosaveAction.Autosave=Sauvegarder automatiquement EntryEditorActionGroup.Advanced=Avanc\u00E9 EntryEditorActionGroup.OpenSchemaBrowser=Ouvrir le navigateur de sch\u00E9ma -EntryEditorActionGroup.ShowIn=Afficher dans +EntryEditorShowInMenuManager.ShowIn=Afficher dans LdifEntryEditorDocumentProvider.InvalidDN=Distinguished Name invalide. LdifEntryEditorDocumentProvider.InvalidLdif=LDIF invalide: {0} LdifEntryEditorDocumentProvider.InvalidRecordType=Le contenu d'un unique enregistrement LDIF est attendu. LdifEntryEditorDocumentProvider.ModDnNotSupported=La modification du Distinguished Name n'est pas support\u00E9 par l'\u00E9diteur d'entr\u00E9e LDIF. +LocateEntryInLdapBrowserAction.LDAPBrowser=Navigateur LDAP +LocateSearchResultOrBookmarkAction.Bookmarks=Signets +LocateSearchResultOrBookmarkAction.Searches=Recherches OpenEntryEditorAction.EditEntry=Editer l'entr\u00E9e... OpenEntryEditorPreferencePageAction.Preferences=Pr\u00E9f\u00E9rences... OpenEntryEditorPreferencePageAction.PreferencesToolTip=Pr\u00E9f\u00E9rences...