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 2015/04/22 18:39:56 UTC
svn commit: r1675411 - in
/directory/studio/trunk/plugins/apacheds.configuration: ./
src/main/java/org/apache/directory/studio/apacheds/configuration/editor/
Author: elecharny
Date: Wed Apr 22 16:39:55 2015
New Revision: 1675411
URL: http://svn.apache.org/r1675411
Log:
o Formatted the plugin.xml (tabs removal, etc)
o Used the commonUI createIntegerText method
Modified:
directory/studio/trunk/plugins/apacheds.configuration/plugin.xml
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java
Modified: directory/studio/trunk/plugins/apacheds.configuration/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/plugin.xml?rev=1675411&r1=1675410&r2=1675411&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/plugin.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/plugin.xml Wed Apr 22 16:39:55 2015
@@ -19,75 +19,59 @@
under the License.
-->
<plugin>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor"
- default="false"
- icon="resources/icons/editor.gif"
- id="%Editor_ServerConfigurationEditor_id"
- name="%Editor_ServerConfigurationEditor_name">
- <contentTypeBinding
- contentTypeId="%ContentType_ServerConfiguration_id">
- </contentTypeBinding>
- </editor>
- </extension>
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- describer="org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationContentDescriber"
- file-names="config.ldif"
- id="%ContentType_ServerConfiguration_id"
- name="%ContentType_ServerConfiguration_name">
- </content-type>
- </extension>
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.apache.directory.studio.connection.core.Connection"
- id="org.apache.directory.studio.connection.core.Connection">
- <action
- class="org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction"
- enablesFor="1"
- id="%OpenConfigurationAction_id"
- label="%OpenConfigurationAction_label"
- icon="resources/icons/editor.gif">
- </action>
- <visibility>
- <and>
- <objectState
- name="vendorName"
- value="Apache Software Foundation">
- </objectState>
- <or>
- <objectState
- name="vendorVersion"
- value="2.0.0">
- </objectState>
- <!-- Special case to handle ApacheDS servers launched via Eclipse -->
- <!--<objectState
- name="vendorVersion"
- value="${project.version}">
- </objectState>-->
- </or>
- </and>
- </visibility>
- </objectContribution>
- </extension>
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- id="%NewWizards_Category_id"
- name="%NewWizards_Category_name" />
- <wizard
- canFinishEarly="true"
- category="%NewWizards_Category_id"
- class="org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard"
- hasPages="false"
- icon="resources/icons/editor_new.gif"
- id="%NewWizards_NewApacheDSConfigurationFileWizard_id"
- name="%NewWizards_NewApacheDSConfigurationFileWizard_name"
- project="false"/>
- </extension>
-
+ <extension point="org.eclipse.ui.editors">
+ <editor
+ class="org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor"
+ default="false"
+ icon="resources/icons/editor.gif"
+ id="%Editor_ServerConfigurationEditor_id"
+ name="%Editor_ServerConfigurationEditor_name">
+ <contentTypeBinding contentTypeId="%ContentType_ServerConfiguration_id"/>
+ </editor>
+ </extension>
+
+ <extension point="org.eclipse.core.contenttype.contentTypes">
+ <content-type
+ describer="org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationContentDescriber"
+ file-names="config.ldif"
+ id="%ContentType_ServerConfiguration_id"
+ name="%ContentType_ServerConfiguration_name"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ objectClass="org.apache.directory.studio.connection.core.Connection"
+ id="org.apache.directory.studio.connection.core.Connection">
+ <action
+ class="org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction"
+ enablesFor="1"
+ id="%OpenConfigurationAction_id"
+ label="%OpenConfigurationAction_label"
+ icon="resources/icons/editor.gif"/>
+ <visibility>
+ <and>
+ <objectState name="vendorName" value="Apache Software Foundation"/>
+ <or>
+ <objectState name="vendorVersion" value="2.0.0"/>
+ <!-- Special case to handle ApacheDS servers launched via Eclipse -->
+ <!--<objectState name="vendorVersion" value="${project.version}" /> -->
+ </or>
+ </and>
+ </visibility>
+ </objectContribution>
+ </extension>
+
+ <!-- Add a new entry to create an ApacheDS configuration in the New menu -->
+ <extension point="org.eclipse.ui.newWizards">
+ <category id="%NewWizards_Category_id" name="%NewWizards_Category_name" />
+ <wizard
+ canFinishEarly="true"
+ category="%NewWizards_Category_id"
+ class="org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard"
+ hasPages="false"
+ icon="resources/icons/editor_new.gif"
+ id="%NewWizards_NewApacheDSConfigurationFileWizard_id"
+ name="%NewWizards_NewApacheDSConfigurationFileWizard_name"
+ project="false"/>
+ </extension>
</plugin>
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java?rev=1675411&r1=1675410&r2=1675411&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java Wed Apr 22 16:39:55 2015
@@ -32,6 +32,7 @@ import org.apache.directory.server.confi
import org.apache.directory.server.config.beans.TransportBean;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.studio.common.ui.CommonUIUtils;
+import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -579,17 +580,17 @@ public class KerberosServerPage extends
// Max Renewable Lifetime Text
toolkit.createLabel( composite, Messages.getString( "KerberosServerPage.MaxRenewableLifetime" ) ); //$NON-NLS-1$
- maximumRenewableLifetimeText = createIntegerText( toolkit, composite );
+ maximumRenewableLifetimeText = BaseWidgetUtils.createIntegerText( toolkit, composite );
setGridDataWithDefaultWidth( maximumRenewableLifetimeText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Max Ticket Lifetime Text
toolkit.createLabel( composite, Messages.getString( "KerberosServerPage.MaxTicketLifetime" ) ); //$NON-NLS-1$
- maximumTicketLifetimeText = createIntegerText( toolkit, composite );
+ maximumTicketLifetimeText = BaseWidgetUtils.createIntegerText( toolkit, composite );
setGridDataWithDefaultWidth( maximumTicketLifetimeText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Allowable Clock Skew Text
toolkit.createLabel( composite, Messages.getString( "KerberosServerPage.AllowableClockSkew" ) ); //$NON-NLS-1$
- allowableClockSkewText = createIntegerText( toolkit, composite );
+ allowableClockSkewText = BaseWidgetUtils.createIntegerText( toolkit, composite );
setGridDataWithDefaultWidth( allowableClockSkewText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java?rev=1675411&r1=1675410&r2=1675411&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java Wed Apr 22 16:39:55 2015
@@ -36,6 +36,7 @@ import org.apache.directory.server.confi
import org.apache.directory.server.config.beans.TcpTransportBean;
import org.apache.directory.server.config.beans.TransportBean;
import org.apache.directory.studio.common.ui.CommonUIUtils;
+import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -1222,17 +1223,17 @@ public class LdapLdapsServersPage extend
// Max. Time Limit Text
toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.MaxTimeLimit" ) ); //$NON-NLS-1$
- maxTimeLimitText = createIntegerText( toolkit, composite );
+ maxTimeLimitText = BaseWidgetUtils.createIntegerText( toolkit, composite );
maxTimeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Max. Size Limit Text
toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.MaxSizeLimit" ) ); //$NON-NLS-1$
- maxSizeLimitText = createIntegerText( toolkit, composite );
+ maxSizeLimitText = BaseWidgetUtils.createIntegerText( toolkit, composite );
maxSizeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Max. PDU Size Text
toolkit.createLabel( composite, Messages.getString( "LdapLdapsServersPage.MaxPduSize" ) ); //$NON-NLS-1$
- maxPduSizeText = createIntegerText( toolkit, composite );
+ maxPduSizeText = BaseWidgetUtils.createIntegerText( toolkit, composite );
maxPduSizeText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
@@ -1455,12 +1456,12 @@ public class LdapLdapsServersPage extend
// Replication Pinger Sleep
toolkit.createLabel( composite, "Replication Pinger Sleep (sec):" );
- replicationPingerSleepText = createIntegerText( toolkit, composite );
+ replicationPingerSleepText = BaseWidgetUtils.createIntegerText( toolkit, composite );
replicationPingerSleepText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Disk Synchronization Delay
toolkit.createLabel( composite, "Disk Synchronization Delay (ms):" );
- diskSynchronizationDelayText = createIntegerText( toolkit, composite );
+ diskSynchronizationDelayText = BaseWidgetUtils.createIntegerText( toolkit, composite );
diskSynchronizationDelayText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java?rev=1675411&r1=1675410&r2=1675411&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java Wed Apr 22 16:39:55 2015
@@ -449,32 +449,6 @@ public abstract class ServerConfiguratio
/**
- * Creates a Text that can be used to enter an integer.
- *
- * @param toolkit the toolkit
- * @param parent the parent
- * @return a Text that can be used to enter a port number
- */
- protected Text createIntegerText( FormToolkit toolkit, Composite parent )
- {
- Text integerText = toolkit.createText( parent, "" ); //$NON-NLS-1$
-
- integerText.addVerifyListener( new VerifyListener()
- {
- public void verifyText( VerifyEvent e )
- {
- if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$
- {
- e.doit = false;
- }
- }
- } );
-
- return integerText;
- }
-
-
- /**
* Creates default value Label.
*
* @param toolkit the toolkit