You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/09/03 22:58:54 UTC
svn commit: r1807179 [2/2] - in
/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config:
./ actions/ editor/ editor/databases/ editor/overlays/ editor/pages/ jobs/
model/ model/io...
Copied: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLdapConfigurationFileWizard.java (from r1807178, directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLDAPConfigurationFileWizard.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLdapConfigurationFileWizard.java?p2=directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLdapConfigurationFileWizard.java&p1=directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLDAPConfigurationFileWizard.java&r1=1807178&r2=1807179&rev=1807179&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLDAPConfigurationFileWizard.java (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLdapConfigurationFileWizard.java Sun Sep 3 22:58:53 2017
@@ -20,13 +20,17 @@
package org.apache.directory.studio.openldap.config.wizards;
+import org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.AttributeValueEditorDialog;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
import org.apache.directory.studio.openldap.config.editor.NewServerConfigurationInput;
-import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.OpenLdapServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.dialogs.OpenLdapConfigDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -36,8 +40,49 @@ import org.eclipse.ui.PlatformUI;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class NewOpenLDAPConfigurationFileWizard extends Wizard implements INewWizard
+public class NewOpenLdapConfigurationFileWizard extends Wizard implements INewWizard
{
+ /** The window. */
+ private IWorkbenchWindow window;
+
+ /**
+ * Creates a new instance of NewOpenLDAPConfigurationFileWizard.
+ */
+ public NewOpenLdapConfigurationFileWizard()
+ {
+ // Nothing to do
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init( IWorkbench workbench, IStructuredSelection selection )
+ {
+ window = workbench.getActiveWorkbenchWindow();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dispose()
+ {
+ window = null;
+ }
+
+
+ /**
+ * Gets the id.
+ *
+ * @return the id
+ */
+ public static String getId()
+ {
+ return OpenLdapConfigurationPluginConstants.WIZARD_NEW_OPENLDAP_CONFIG;
+ }
+
+
/**
* {@inheritDoc}
*/
@@ -54,8 +99,17 @@ public class NewOpenLDAPConfigurationFil
{
try
{
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- page.openEditor( new NewServerConfigurationInput(), OpenLDAPServerConfigurationEditor.ID );
+ OpenLdapConfigDialog dialog = new OpenLdapConfigDialog( getShell() );
+
+ if ( dialog.open() == AttributeValueEditorDialog.OK )
+ {
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ NewServerConfigurationInput configInput = new NewServerConfigurationInput();
+ configInput.setOpenLdapConfigFormat( dialog.getOpenLdapConfigFormat() );
+ configInput.setOpenLdapVersion( dialog.getOpenLdapVersion() );
+
+ page.openEditor( configInput, OpenLdapServerConfigurationEditor.ID );
+ }
}
catch ( PartInitException e )
{
@@ -65,12 +119,4 @@ public class NewOpenLDAPConfigurationFil
return true;
}
-
-
- /**
- * {@inheritDoc}
- */
- public void init( IWorkbench workbench, IStructuredSelection selection )
- {
- }
}
Added: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages.properties?rev=1807179&view=auto
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages.properties (added)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages.properties Sun Sep 3 22:58:53 2017
@@ -0,0 +1,19 @@
+# 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.
+OpenLdapConfigurationPlugin.UnableGetProperties=Unable to get the plugin properties.
+NewOpenLDAPConfigurationWizardPage.OpenLDAPConfigurationCreation=OpenLDAP configuration creation
+NewOpenLDAPConfigurationWizardPage.OpenLDAPConfigurationTitle=New OpenLDAP Configuration
\ No newline at end of file
Added: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_de.properties?rev=1807179&view=auto
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_de.properties (added)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_de.properties Sun Sep 3 22:58:53 2017
@@ -0,0 +1,17 @@
+# 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.
+OpenLdapConfigurationPlugin.UnableGetProperties=Die Plugin Eigenschaften sind nicht erreichbar.
Added: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_fr.properties?rev=1807179&view=auto
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_fr.properties (added)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/messages_fr.properties Sun Sep 3 22:58:53 2017
@@ -0,0 +1,17 @@
+# 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.
+OpenLdapConfigurationPlugin.UnableGetProperties=Impossible de r\u00E9cup\u00E9rer les propri\u00E9t\u00E9s du plugin