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 2008/09/01 16:42:40 UTC
svn commit: r690979 - in
/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor:
LdifEditorConstants.java editor/LdifEditor.java
wizards/NewLdifFileWizard.java
Author: pamarcelot
Date: Mon Sep 1 07:42:39 2008
New Revision: 690979
URL: http://svn.apache.org/viewvc?rev=690979&view=rev
Log:
Part of a fix for DIRSTUDIO-375 (Move each plugin IDs in a plugin.properties file).
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/wizards/NewLdifFileWizard.java
Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java?rev=690979&r1=690978&r2=690979&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java (original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java Mon Sep 1 07:42:39 2008
@@ -35,6 +35,12 @@
public static final String ACTION_ID_EDIT_RECORD = LdifEditorActivator.getDefault().getPluginProperties()
.getString( "Cmd_EditRecord_id" );
+ public static final String NEW_WIZARD_NEW_LDIF_FILE = LdifEditorActivator.getDefault().getPluginProperties()
+ .getString( "NewWizard_NewLdifFileWizard_id" );
+
+ public static final String EDITOR_LDIF_EDITOR = LdifEditorActivator.getDefault().getPluginProperties()
+ .getString( "Editor_LdifEditor_id" );
+
public static final String PREFERENCE_LDIFEDITOR_FORMATTER_AUTOWRAP = "ldifEditorFormatterAutoWrap";
public static final String PREFERENCE_LDIFEDITOR_FOLDING_ENABLE = "ldifEditorFoldingEnable";
Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=690979&r1=690978&r2=690979&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java (original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java Mon Sep 1 07:42:39 2008
@@ -210,7 +210,7 @@
*/
public static String getId()
{
- return LdifEditor.class.getName();
+ return LdifEditorConstants.EDITOR_LDIF_EDITOR;
}
@@ -573,7 +573,7 @@
+ ( browserConnection == null || browserConnection.getConnection() == null ? "-" : browserConnection
.getConnection().getName() ) );
// getStatusField("ldapconnection").setText();
-
+
IAction action = getAction( ExecuteLdifAction.class.getName() );
if ( action != null )
{
@@ -638,10 +638,6 @@
}
-
-
-
-
/**
* This implementation checks if the input is of type
* NonExistingLdifEditorInput. In that case doSaveAs() is
@@ -662,7 +658,6 @@
}
-
/**
* The input could be one of the following types:
* - NonExistingLdifEditorInput: New file, not yet saved
@@ -794,8 +789,7 @@
{
IContextService contextService = ( IContextService ) PlatformUI.getWorkbench().getAdapter(
IContextService.class );
- contextActivation = contextService
- .activateContext( BrowserCommonConstants.CONTEXT_WINDOWS );
+ contextActivation = contextService.activateContext( BrowserCommonConstants.CONTEXT_WINDOWS );
activateGlobalActionHandlers();
}
Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/wizards/NewLdifFileWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/wizards/NewLdifFileWizard.java?rev=690979&r1=690978&r2=690979&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/wizards/NewLdifFileWizard.java (original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/wizards/NewLdifFileWizard.java Mon Sep 1 07:42:39 2008
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldifeditor.wizards;
+import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
import org.apache.directory.studio.ldifeditor.editor.LdifEditor;
import org.apache.directory.studio.ldifeditor.editor.NonExistingLdifEditorInput;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -81,7 +82,7 @@
*/
public static String getId()
{
- return NewLdifFileWizard.class.getName();
+ return LdifEditorConstants.NEW_WIZARD_NEW_LDIF_FILE;
}