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/07/12 18:34:42 UTC
svn commit: r1690480 - in /directory/studio/trunk/plugins:
openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/
openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/
Author: elecharny
Date: Sun Jul 12 16:34:42 2015
New Revision: 1690480
URL: http://svn.apache.org/r1690480
Log:
o Used the SchemaObjectLoader class instead of the AttributeLoader class
o Renamed a method in AllowFeatureEnum
o Added the getNames() method in the DnSpecTypeEnum, DnSpecStyleEnuma dn AllowFeatureEnum enums
Modified:
directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AllowFeatureEnum.java
directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AuthzPolicyEnum.java
directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecStyleEnum.java
directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecTypeEnum.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/AllowFeatureDialog.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/DbIndexDialog.java
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AllowFeatureEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AllowFeatureEnum.java?rev=1690480&r1=1690479&r2=1690480&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AllowFeatureEnum.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AllowFeatureEnum.java Sun Jul 12 16:34:42 2015
@@ -59,7 +59,25 @@ public enum AllowFeatureEnum
{
return name;
}
+
+ /**
+ * @return An array with all the Enum value's name
+ */
+ public static String[] getNames()
+ {
+ String[] names = new String[values().length];
+ int pos = 0;
+
+ for ( AllowFeatureEnum allowFeature : values() )
+ {
+ names[pos] = allowFeature.getName();
+ pos++;
+ }
+
+ return names;
+ }
+
/**
* Get the AllowFeatureEnumd instance from its number
@@ -67,7 +85,7 @@ public enum AllowFeatureEnum
* @param number The number we are looking for
* @return The associated AllowFeatureEnum instance
*/
- public static AllowFeatureEnum getFeature( int number )
+ public static AllowFeatureEnum getAllowFeature( int number )
{
AllowFeatureEnum[] values = AllowFeatureEnum.values();
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AuthzPolicyEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AuthzPolicyEnum.java?rev=1690480&r1=1690479&r2=1690480&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AuthzPolicyEnum.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/AuthzPolicyEnum.java Sun Jul 12 16:34:42 2015
@@ -75,7 +75,7 @@ public enum AuthzPolicyEnum
/**
- * @return An array with all the ENum value's name
+ * @return An array with all the Enum value's name
*/
public static String[] getNames()
{
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecStyleEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecStyleEnum.java?rev=1690480&r1=1690479&r2=1690480&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecStyleEnum.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecStyleEnum.java Sun Jul 12 16:34:42 2015
@@ -76,4 +76,22 @@ public enum DnSpecStyleEnum
return NONE;
}
+
+
+ /**
+ * @return An array with all the Enum value's name
+ */
+ public static String[] getNames()
+ {
+ String[] names = new String[values().length];
+ int pos = 0;
+
+ for ( DnSpecStyleEnum dnSpecStyle : values() )
+ {
+ names[pos] = dnSpecStyle.getName();
+ pos++;
+ }
+
+ return names;
+ }
}
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecTypeEnum.java?rev=1690480&r1=1690479&r2=1690480&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecTypeEnum.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DnSpecTypeEnum.java Sun Jul 12 16:34:42 2015
@@ -69,4 +69,22 @@ public enum DnSpecTypeEnum
return NONE;
}
+
+
+ /**
+ * @return An array with all the Enum value's name
+ */
+ public static String[] getNames()
+ {
+ String[] names = new String[values().length];
+ int pos = 0;
+
+ for ( DnSpecTypeEnum dnSpecType : values() )
+ {
+ names[pos] = dnSpecType.getName();
+ pos++;
+ }
+
+ return names;
+ }
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/AllowFeatureDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/AllowFeatureDialog.java?rev=1690480&r1=1690479&r2=1690480&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/AllowFeatureDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/AllowFeatureDialog.java Sun Jul 12 16:34:42 2015
@@ -116,7 +116,7 @@ public class AllowFeatureDialog extends
{
if ( selectedCheckbox == allowFeatureCheckboxes[i] )
{
- setEditedElement( AllowFeatureEnum.getFeature( i ) );
+ setEditedElement( AllowFeatureEnum.getAllowFeature( i ) );
}
else if ( allowFeatureCheckboxes[i].isEnabled() )
{
@@ -187,7 +187,7 @@ public class AllowFeatureDialog extends
// The various buttons
for ( int i = 1; i < allowFeatureCheckboxes.length; i++ )
{
- String allowFeature = AllowFeatureEnum.getFeature( i ).getName();
+ String allowFeature = AllowFeatureEnum.getAllowFeature( i ).getName();
allowFeatureCheckboxes[i] = BaseWidgetUtils.createCheckbox( allowFeatureGroup, allowFeature, 1 );
allowFeatureCheckboxes[i].addSelectionListener( checkboxSelectionListener );
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/DbIndexDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/DbIndexDialog.java?rev=1690480&r1=1690479&r2=1690480&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/DbIndexDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/DbIndexDialog.java Sun Jul 12 16:34:42 2015
@@ -32,7 +32,7 @@ import org.apache.directory.studio.commo
import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.common.ui.wrappers.StringValueWrapper;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.utils.AttributeLoader;
+import org.apache.directory.studio.ldapbrowser.core.utils.SchemaObjectLoader;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -81,7 +81,7 @@ import org.apache.directory.studio.openl
public class DbIndexDialog extends AddEditDialog<DbIndexWrapper>
{
/** The Attribute list loader */
- private AttributeLoader attributeLoader;
+ private SchemaObjectLoader attributeLoader;
// UI widgets
// The attribute's group
@@ -394,7 +394,7 @@ public class DbIndexDialog extends AddEd
{
super( parentShell );
super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
- attributeLoader = new AttributeLoader();
+ attributeLoader = new SchemaObjectLoader();
}