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 2011/01/26 20:25:25 UTC
svn commit: r1063841 [5/6] - in
/directory/studio/trunk/plugins/schemaeditor: ./
src/main/java/org/apache/directory/studio/schemaeditor/
src/main/java/org/apache/directory/studio/schemaeditor/controller/
src/main/java/org/apache/directory/studio/schema...
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -22,10 +22,10 @@ package org.apache.directory.studio.sche
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
import org.apache.directory.studio.schemaeditor.view.wrappers.Folder;
@@ -84,7 +84,7 @@ public class SchemaViewLabelProvider ext
}
else if ( element instanceof AttributeTypeWrapper )
{
- AttributeTypeImpl at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
+ AttributeType at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
// Label
if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
@@ -137,7 +137,7 @@ public class SchemaViewLabelProvider ext
}
else if ( element instanceof ObjectClassWrapper )
{
- ObjectClassImpl oc = ( ( ObjectClassWrapper ) element ).getObjectClass();
+ ObjectClass oc = ( ( ObjectClassWrapper ) element ).getObjectClass();
// Label
if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
@@ -208,7 +208,7 @@ public class SchemaViewLabelProvider ext
String secondaryLabel = ""; //$NON-NLS-1$
if ( element instanceof AttributeTypeWrapper )
{
- AttributeTypeImpl at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
+ AttributeType at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
@@ -241,7 +241,7 @@ public class SchemaViewLabelProvider ext
}
else if ( element instanceof ObjectClassWrapper )
{
- ObjectClassImpl oc = ( ( ObjectClassWrapper ) element ).getObjectClass();
+ ObjectClass oc = ( ( ObjectClassWrapper ) element ).getObjectClass();
if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Wed Jan 26 19:25:22 2011
@@ -26,14 +26,14 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SearchViewController;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditor;
import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditorInput;
@@ -552,14 +552,14 @@ public class SearchView extends ViewPart
String editorId = null;
// Here is the double clicked item
- if ( item instanceof AttributeTypeImpl )
+ if ( item instanceof AttributeType )
{
- input = new AttributeTypeEditorInput( ( AttributeTypeImpl ) item );
+ input = new AttributeTypeEditorInput( ( AttributeType ) item );
editorId = AttributeTypeEditor.ID;
}
- else if ( item instanceof ObjectClassImpl )
+ else if ( item instanceof ObjectClass )
{
- input = new ObjectClassEditorInput( ( ObjectClassImpl ) item );
+ input = new ObjectClassEditorInput( ( ObjectClass ) item );
editorId = ObjectClassEditor.ID;
}
@@ -698,8 +698,8 @@ public class SearchView extends ViewPart
|| ( scope == PluginConstants.PREFS_SEARCH_PAGE_SCOPE_AT_ONLY ) )
{
// Looping on attribute types
- List<AttributeTypeImpl> attributeTypes = schemaHandler.getAttributeTypes();
- for ( AttributeTypeImpl at : attributeTypes )
+ List<AttributeType> attributeTypes = schemaHandler.getAttributeTypes();
+ for ( AttributeType at : attributeTypes )
{
// Aliases
if ( searchScope.contains( SearchInEnum.ALIASES ) )
@@ -782,8 +782,8 @@ public class SearchView extends ViewPart
|| ( scope == PluginConstants.PREFS_SEARCH_PAGE_SCOPE_OC_ONLY ) )
{
// Looping on object classes
- List<ObjectClassImpl> objectClasses = schemaHandler.getObjectClasses();
- for ( ObjectClassImpl oc : objectClasses )
+ List<ObjectClass> objectClasses = schemaHandler.getObjectClasses();
+ for ( ObjectClass oc : objectClasses )
{
// Aliases
if ( searchScope.contains( SearchInEnum.ALIASES ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java Wed Jan 26 19:25:22 2011
@@ -25,11 +25,11 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.wrappers.TreeNode;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -68,34 +68,34 @@ public class SearchViewContentProvider i
List<String> o1Names = null;
List<String> o2Names = null;
- if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof AttributeTypeImpl ) )
+ if ( ( o1 instanceof AttributeType ) && ( o2 instanceof AttributeType ) )
{
- AttributeTypeImpl at1 = ( AttributeTypeImpl ) o1;
- AttributeTypeImpl at2 = ( AttributeTypeImpl ) o2;
+ AttributeType at1 = ( AttributeType ) o1;
+ AttributeType at2 = ( AttributeType ) o2;
o1Names = at1.getNames();
o2Names = at2.getNames();
}
- else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof ObjectClassImpl ) )
+ else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof ObjectClass ) )
{
- ObjectClassImpl oc1 = ( ObjectClassImpl ) o1;
- ObjectClassImpl oc2 = ( ObjectClassImpl ) o2;
+ ObjectClass oc1 = ( ObjectClass ) o1;
+ ObjectClass oc2 = ( ObjectClass ) o2;
o1Names = oc1.getNames();
o2Names = oc2.getNames();
}
- else if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof ObjectClassImpl ) )
+ else if ( ( o1 instanceof AttributeType ) && ( o2 instanceof ObjectClass ) )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) o1;
- ObjectClassImpl oc = ( ObjectClassImpl ) o2;
+ AttributeType at = ( AttributeType ) o1;
+ ObjectClass oc = ( ObjectClass ) o2;
o1Names = at.getNames();
o2Names = oc.getNames();
}
- else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof AttributeTypeImpl ) )
+ else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof AttributeType ) )
{
- ObjectClassImpl oc = ( ObjectClassImpl ) o1;
- AttributeTypeImpl at = ( AttributeTypeImpl ) o2;
+ ObjectClass oc = ( ObjectClass ) o1;
+ AttributeType at = ( AttributeType ) o2;
o1Names = oc.getNames();
o2Names = at.getNames();
@@ -106,15 +106,15 @@ public class SearchViewContentProvider i
{
if ( ( o1Names.size() > 0 ) && ( o2Names.size() > 0 ) )
{
- return o1Names.get(0).compareToIgnoreCase( o2Names.get(0) );
+ return o1Names.get( 0 ).compareToIgnoreCase( o2Names.get( 0 ) );
}
else if ( ( o1Names.size() == 0 ) && ( o2Names.size() > 0 ) )
{
- return "".compareToIgnoreCase( o2Names.get(0) ); //$NON-NLS-1$
+ return "".compareToIgnoreCase( o2Names.get( 0 ) ); //$NON-NLS-1$
}
else if ( ( o1Names.size() > 0 ) && ( o2Names.size() == 0 ) )
{
- return o1Names.get(0).compareToIgnoreCase( "" ); //$NON-NLS-1$
+ return o1Names.get( 0 ).compareToIgnoreCase( "" ); //$NON-NLS-1$
}
}
@@ -127,31 +127,31 @@ public class SearchViewContentProvider i
{
public int compare( SchemaObject o1, SchemaObject o2 )
{
- if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof AttributeTypeImpl ) )
+ if ( ( o1 instanceof AttributeType ) && ( o2 instanceof AttributeType ) )
{
- AttributeTypeImpl at1 = ( AttributeTypeImpl ) o1;
- AttributeTypeImpl at2 = ( AttributeTypeImpl ) o2;
+ AttributeType at1 = ( AttributeType ) o1;
+ AttributeType at2 = ( AttributeType ) o2;
return at1.getOid().compareToIgnoreCase( at2.getOid() );
}
- else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof ObjectClassImpl ) )
+ else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof ObjectClass ) )
{
- ObjectClassImpl oc1 = ( ObjectClassImpl ) o1;
- ObjectClassImpl oc2 = ( ObjectClassImpl ) o2;
+ ObjectClass oc1 = ( ObjectClass ) o1;
+ ObjectClass oc2 = ( ObjectClass ) o2;
return oc1.getOid().compareToIgnoreCase( oc2.getOid() );
}
- else if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof ObjectClassImpl ) )
+ else if ( ( o1 instanceof AttributeType ) && ( o2 instanceof ObjectClass ) )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) o1;
- ObjectClassImpl oc = ( ObjectClassImpl ) o2;
+ AttributeType at = ( AttributeType ) o1;
+ ObjectClass oc = ( ObjectClass ) o2;
return at.getOid().compareToIgnoreCase( oc.getOid() );
}
- else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof AttributeTypeImpl ) )
+ else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof AttributeType ) )
{
- ObjectClassImpl oc = ( ObjectClassImpl ) o1;
- AttributeTypeImpl at = ( AttributeTypeImpl ) o2;
+ ObjectClass oc = ( ObjectClass ) o1;
+ AttributeType at = ( AttributeType ) o2;
return oc.getOid().compareToIgnoreCase( at.getOid() );
}
@@ -208,18 +208,18 @@ public class SearchViewContentProvider i
if ( group == PluginConstants.PREFS_SEARCH_VIEW_GROUPING_ATTRIBUTE_TYPES_FIRST )
{
- List<AttributeTypeImpl> attributeTypes = new ArrayList<AttributeTypeImpl>();
- List<ObjectClassImpl> objectClasses = new ArrayList<ObjectClassImpl>();
+ List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+ List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
for ( SchemaObject searchResult : searchResults )
{
- if ( searchResult instanceof AttributeTypeImpl )
+ if ( searchResult instanceof AttributeType )
{
- attributeTypes.add( ( AttributeTypeImpl ) searchResult );
+ attributeTypes.add( ( AttributeType ) searchResult );
}
- else if ( searchResult instanceof ObjectClassImpl )
+ else if ( searchResult instanceof ObjectClass )
{
- objectClasses.add( ( ObjectClassImpl ) searchResult );
+ objectClasses.add( ( ObjectClass ) searchResult );
}
}
@@ -247,18 +247,18 @@ public class SearchViewContentProvider i
}
else if ( group == PluginConstants.PREFS_SEARCH_VIEW_GROUPING_OBJECT_CLASSES_FIRST )
{
- List<AttributeTypeImpl> attributeTypes = new ArrayList<AttributeTypeImpl>();
- List<ObjectClassImpl> objectClasses = new ArrayList<ObjectClassImpl>();
+ List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+ List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
for ( SchemaObject searchResult : searchResults )
{
- if ( searchResult instanceof AttributeTypeImpl )
+ if ( searchResult instanceof AttributeType )
{
- attributeTypes.add( ( AttributeTypeImpl ) searchResult );
+ attributeTypes.add( ( AttributeType ) searchResult );
}
- else if ( searchResult instanceof ObjectClassImpl )
+ else if ( searchResult instanceof ObjectClass )
{
- objectClasses.add( ( ObjectClassImpl ) searchResult );
+ objectClasses.add( ( ObjectClass ) searchResult );
}
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -22,11 +22,11 @@ package org.apache.directory.studio.sche
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.LabelProvider;
@@ -71,9 +71,9 @@ public class SearchViewLabelProvider ext
.getInt( PluginConstants.PREFS_SEARCH_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH );
boolean schemaLabelDisplay = store.getBoolean( PluginConstants.PREFS_SEARCH_VIEW_SCHEMA_LABEL_DISPLAY );
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) element;
+ AttributeType at = ( AttributeType ) element;
// Label
if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
@@ -124,9 +124,9 @@ public class SearchViewLabelProvider ext
label = label.substring( 0, abbreviateMaxLength ) + "..."; //$NON-NLS-1$
}
}
- else if ( element instanceof ObjectClassImpl )
+ else if ( element instanceof ObjectClass )
{
- ObjectClassImpl oc = ( ObjectClassImpl ) element;
+ ObjectClass oc = ( ObjectClass ) element;
// Label
if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
@@ -182,9 +182,9 @@ public class SearchViewLabelProvider ext
if ( secondaryLabelDisplay )
{
String secondaryLabel = ""; //$NON-NLS-1$
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) element;
+ AttributeType at = ( AttributeType ) element;
if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
@@ -215,9 +215,9 @@ public class SearchViewLabelProvider ext
secondaryLabel = at.getOid();
}
}
- else if ( element instanceof ObjectClassImpl )
+ else if ( element instanceof ObjectClass )
{
- ObjectClassImpl oc = ( ObjectClassImpl ) element;
+ ObjectClass oc = ( ObjectClass ) element;
if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
@@ -277,11 +277,11 @@ public class SearchViewLabelProvider ext
*/
public Image getImage( Object element )
{
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
- else if ( element instanceof ObjectClassImpl )
+ else if ( element instanceof ObjectClass )
{
return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -22,10 +22,10 @@ package org.apache.directory.studio.sche
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.model.difference.AttributeTypeDifference;
import org.apache.directory.studio.schemaeditor.model.difference.ObjectClassDifference;
@@ -93,21 +93,21 @@ public class DifferencesWidgetSchemaLabe
{
AttributeTypeDifference atd = ( AttributeTypeDifference ) element;
- AttributeTypeImpl at = null;
+ AttributeType at = null;
switch ( atd.getType() )
{
case ADDED:
- at = ( ( AttributeTypeImpl ) atd.getDestination() );
+ at = ( ( AttributeType ) atd.getDestination() );
break;
case MODIFIED:
- at = ( ( AttributeTypeImpl ) atd.getDestination() );
+ at = ( ( AttributeType ) atd.getDestination() );
break;
case REMOVED:
- at = ( ( AttributeTypeImpl ) atd.getSource() );
+ at = ( ( AttributeType ) atd.getSource() );
break;
case IDENTICAL:
- at = ( ( AttributeTypeImpl ) atd.getDestination() );
+ at = ( ( AttributeType ) atd.getDestination() );
break;
}
@@ -164,21 +164,21 @@ public class DifferencesWidgetSchemaLabe
{
ObjectClassDifference ocd = ( ObjectClassDifference ) element;
- ObjectClassImpl oc = null;
+ ObjectClass oc = null;
switch ( ocd.getType() )
{
case ADDED:
- oc = ( ( ObjectClassImpl ) ocd.getDestination() );
+ oc = ( ( ObjectClass ) ocd.getDestination() );
break;
case MODIFIED:
- oc = ( ( ObjectClassImpl ) ocd.getDestination() );
+ oc = ( ( ObjectClass ) ocd.getDestination() );
break;
case REMOVED:
- oc = ( ( ObjectClassImpl ) ocd.getSource() );
+ oc = ( ( ObjectClass ) ocd.getSource() );
break;
case IDENTICAL:
- oc = ( ( ObjectClassImpl ) ocd.getDestination() );
+ oc = ( ( ObjectClass ) ocd.getDestination() );
break;
}
@@ -246,21 +246,21 @@ public class DifferencesWidgetSchemaLabe
{
AttributeTypeDifference atd = ( AttributeTypeDifference ) element;
- AttributeTypeImpl at = null;
+ AttributeType at = null;
switch ( atd.getType() )
{
case ADDED:
- at = ( ( AttributeTypeImpl ) atd.getDestination() );
+ at = ( ( AttributeType ) atd.getDestination() );
break;
case MODIFIED:
- at = ( ( AttributeTypeImpl ) atd.getDestination() );
+ at = ( ( AttributeType ) atd.getDestination() );
break;
case REMOVED:
- at = ( ( AttributeTypeImpl ) atd.getSource() );
+ at = ( ( AttributeType ) atd.getSource() );
break;
case IDENTICAL:
- at = ( ( AttributeTypeImpl ) atd.getDestination() );
+ at = ( ( AttributeType ) atd.getDestination() );
break;
}
@@ -297,21 +297,21 @@ public class DifferencesWidgetSchemaLabe
{
ObjectClassDifference ocd = ( ObjectClassDifference ) element;
- ObjectClassImpl oc = null;
+ ObjectClass oc = null;
switch ( ocd.getType() )
{
case ADDED:
- oc = ( ( ObjectClassImpl ) ocd.getDestination() );
+ oc = ( ( ObjectClass ) ocd.getDestination() );
break;
case MODIFIED:
- oc = ( ( ObjectClassImpl ) ocd.getDestination() );
+ oc = ( ( ObjectClass ) ocd.getDestination() );
break;
case REMOVED:
- oc = ( ( ObjectClassImpl ) ocd.getSource() );
+ oc = ( ( ObjectClass ) ocd.getSource() );
break;
case IDENTICAL:
- oc = ( ( ObjectClassImpl ) ocd.getDestination() );
+ oc = ( ( ObjectClass ) ocd.getDestination() );
break;
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Wed Jan 26 19:25:22 2011
@@ -37,11 +37,11 @@ import javax.naming.NamingException;
import org.apache.directory.shared.converter.schema.AttributeTypeHolder;
import org.apache.directory.shared.converter.schema.ObjectClassHolder;
import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -258,7 +258,7 @@ public class ExportSchemasForADSWizard e
sb.append( "\n" ); //$NON-NLS-1$
// Generating LDIF for Attributes Types
- for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+ for ( AttributeType at : schema.getAttributeTypes() )
{
AttributeTypeHolder holder = new AttributeTypeHolder( at.getOid() );
holder.setCollective( at.isCollective() );
@@ -340,8 +340,8 @@ public class ExportSchemasForADSWizard e
sb.append( "\n" ); //$NON-NLS-1$
// Generating LDIF for Object Classes
- List<ObjectClassImpl> sortedObjectClasses = getSortedObjectClasses( schema.getObjectClasses() );
- for ( ObjectClassImpl oc : sortedObjectClasses )
+ List<ObjectClass> sortedObjectClasses = getSortedObjectClasses( schema.getObjectClasses() );
+ for ( ObjectClass oc : sortedObjectClasses )
{
ObjectClassHolder holder = new ObjectClassHolder( oc.getOid() );
holder.setClassType( oc.getType() );
@@ -397,14 +397,14 @@ public class ExportSchemasForADSWizard e
* @param objectClasses the unsorted object classes
* @return the sorted object classes
*/
- private List<ObjectClassImpl> getSortedObjectClasses( List<ObjectClassImpl> objectClasses )
+ private List<ObjectClass> getSortedObjectClasses( List<ObjectClass> objectClasses )
{
// clone the unsorted list
- List<ObjectClassImpl> unsortedObjectClasses = new ArrayList<ObjectClassImpl>( objectClasses );
+ List<ObjectClass> unsortedObjectClasses = new ArrayList<ObjectClass>( objectClasses );
// list of all existing names
Set<String> objectClassNames = new HashSet<String>();
- for ( ObjectClassImpl oc : unsortedObjectClasses )
+ for ( ObjectClass oc : unsortedObjectClasses )
{
for ( String name : oc.getNames() )
{
@@ -413,16 +413,16 @@ public class ExportSchemasForADSWizard e
}
// sort object classes
- List<ObjectClassImpl> sortedObjectClasses = new ArrayList<ObjectClassImpl>();
+ List<ObjectClass> sortedObjectClasses = new ArrayList<ObjectClass>();
Set<String> movedObjectClasses = new HashSet<String>();
boolean moved = true;
while ( !unsortedObjectClasses.isEmpty() && moved )
{
moved = false;
- Iterator<ObjectClassImpl> unsortedIterator = unsortedObjectClasses.iterator();
+ Iterator<ObjectClass> unsortedIterator = unsortedObjectClasses.iterator();
while ( unsortedIterator.hasNext() )
{
- ObjectClassImpl oc = unsortedIterator.next();
+ ObjectClass oc = unsortedIterator.next();
for ( String superName : oc.getSuperiorOids() )
{
if ( !objectClassNames.contains( superName.toLowerCase() )
@@ -442,7 +442,7 @@ public class ExportSchemasForADSWizard e
}
// add the rest
- for ( ObjectClassImpl oc : unsortedObjectClasses )
+ for ( ObjectClass oc : unsortedObjectClasses )
{
sortedObjectClasses.add( oc );
}
@@ -466,13 +466,13 @@ public class ExportSchemasForADSWizard e
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
// Looping on Attribute Types
- for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+ for ( AttributeType at : schema.getAttributeTypes() )
{
// Superior
String supName = at.getSuperiorOid();
if ( supName != null )
{
- AttributeTypeImpl sup = schemaHandler.getAttributeType( supName );
+ AttributeType sup = schemaHandler.getAttributeType( supName );
if ( sup != null )
{
if ( !schema.getName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
@@ -484,7 +484,7 @@ public class ExportSchemasForADSWizard e
}
// Looping on Object Classes
- for ( ObjectClassImpl oc : schema.getObjectClasses() )
+ for ( ObjectClass oc : schema.getObjectClasses() )
{
// Superiors
List<String> supNames = oc.getSuperiorOids();
@@ -492,7 +492,7 @@ public class ExportSchemasForADSWizard e
{
for ( String supName : oc.getSuperiorOids() )
{
- ObjectClassImpl sup = schemaHandler.getObjectClass( supName );
+ ObjectClass sup = schemaHandler.getObjectClass( supName );
if ( sup != null )
{
if ( !schema.getName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
@@ -509,7 +509,7 @@ public class ExportSchemasForADSWizard e
{
for ( String mayName : mayNames )
{
- AttributeTypeImpl may = schemaHandler.getAttributeType( mayName );
+ AttributeType may = schemaHandler.getAttributeType( mayName );
if ( may != null )
{
if ( !schema.getName().toLowerCase().equals( may.getSchemaName().toLowerCase() ) )
@@ -527,7 +527,7 @@ public class ExportSchemasForADSWizard e
{
for ( String mustName : oc.getMustAttributeTypeOids() )
{
- AttributeTypeImpl must = schemaHandler.getAttributeType( mustName );
+ AttributeType must = schemaHandler.getAttributeType( mustName );
if ( must != null )
{
if ( !schema.getName().toLowerCase().equals( must.getSchemaName().toLowerCase() ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java Wed Jan 26 19:25:22 2011
@@ -29,8 +29,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.ProjectType;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -146,13 +144,13 @@ public class MergeSchemasSelectionWizard
if ( parentElement instanceof AttributeTypeFolder )
{
AttributeTypeFolder folder = ( AttributeTypeFolder ) parentElement;
- List<AttributeTypeImpl> attributeTypes = folder.schema.getAttributeTypes();
+ List<AttributeType> attributeTypes = folder.schema.getAttributeTypes();
return attributeTypes.toArray();
}
if ( parentElement instanceof ObjectClassFolder )
{
ObjectClassFolder folder = ( ObjectClassFolder ) parentElement;
- List<ObjectClassImpl> objectClasses = folder.schema.getObjectClasses();
+ List<ObjectClass> objectClasses = folder.schema.getObjectClasses();
return objectClasses.toArray();
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Wed Jan 26 19:25:22 2011
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Set;
import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
@@ -139,8 +139,8 @@ public class MergeSchemasWizard extends
{
AttributeTypeFolder atf = ( AttributeTypeFolder ) sourceObject;
Schema targetSchema = getTargetSchema( atf.schema.getProject(), targetProject, targetSchemas );
- List<AttributeTypeImpl> sourceAttributeTypes = atf.schema.getAttributeTypes();
- for ( AttributeTypeImpl sourceAttributeType : sourceAttributeTypes )
+ List<AttributeType> sourceAttributeTypes = atf.schema.getAttributeTypes();
+ for ( AttributeType sourceAttributeType : sourceAttributeTypes )
{
mergeAttributeType( sourceAttributeType, targetProject, targetSchema, processedObjects,
errorMessages, replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
@@ -150,24 +150,28 @@ public class MergeSchemasWizard extends
{
ObjectClassFolder ocf = ( ObjectClassFolder ) sourceObject;
Schema targetSchema = getTargetSchema( ocf.schema.getProject(), targetProject, targetSchemas );
- List<ObjectClassImpl> sourceObjectClasses = ocf.schema.getObjectClasses();
- for ( ObjectClassImpl sourceObjectClass : sourceObjectClasses )
+ List<ObjectClass> sourceObjectClasses = ocf.schema.getObjectClasses();
+ for ( ObjectClass sourceObjectClass : sourceObjectClasses )
{
mergeObjectClass( sourceObjectClass, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
}
- if ( sourceObject instanceof AttributeTypeImpl )
+ if ( sourceObject instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) sourceObject;
- Schema targetSchema = getTargetSchema( at.getSchemaObject().getProject(), targetProject, targetSchemas );
+ AttributeType at = ( AttributeType ) sourceObject;
+ Schema targetSchema = getTargetSchema(
+ Activator.getDefault().getSchemaHandler().getSchema( at.getSchemaName() ).getProject(),
+ targetProject, targetSchemas );
mergeAttributeType( at, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
- if ( sourceObject instanceof ObjectClassImpl )
+ if ( sourceObject instanceof ObjectClass )
{
- ObjectClassImpl oc = ( ObjectClassImpl ) sourceObject;
- Schema targetSchema = getTargetSchema( oc.getSchemaObject().getProject(), targetProject, targetSchemas );
+ ObjectClass oc = ( ObjectClass ) sourceObject;
+ Schema targetSchema = getTargetSchema(
+ Activator.getDefault().getSchemaHandler().getSchema( oc.getSchemaName() ).getProject(),
+ targetProject, targetSchemas );
mergeObjectClass( oc, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
@@ -213,15 +217,15 @@ public class MergeSchemasWizard extends
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
boolean mergeDependencies, boolean pullUpAttributes )
{
- List<AttributeTypeImpl> sourceAttributeTypes = sourceSchema.getAttributeTypes();
- for ( AttributeTypeImpl sourceAttributeType : sourceAttributeTypes )
+ List<AttributeType> sourceAttributeTypes = sourceSchema.getAttributeTypes();
+ for ( AttributeType sourceAttributeType : sourceAttributeTypes )
{
mergeAttributeType( sourceAttributeType, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
- List<ObjectClassImpl> sourceObjectClasses = sourceSchema.getObjectClasses();
- for ( ObjectClassImpl sourceObjectClass : sourceObjectClasses )
+ List<ObjectClass> sourceObjectClasses = sourceSchema.getObjectClasses();
+ for ( ObjectClass sourceObjectClass : sourceObjectClasses )
{
mergeObjectClass( sourceObjectClass, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
@@ -232,7 +236,7 @@ public class MergeSchemasWizard extends
/**
* Merges the given attribute type to the targetSchema.
*/
- private void mergeAttributeType( AttributeTypeImpl sourceAttributeType, Project targetProject, Schema targetSchema,
+ private void mergeAttributeType( AttributeType sourceAttributeType, Project targetProject, Schema targetSchema,
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
boolean mergeDependencies, boolean pullUpAttributes )
{
@@ -243,7 +247,7 @@ public class MergeSchemasWizard extends
processedObjects.add( sourceAttributeType );
// check if attribute (identified by OID or name) already exists in the project
- AttributeTypeImpl targetAttributeType = targetProject.getSchemaHandler().getAttributeType(
+ AttributeType targetAttributeType = targetProject.getSchemaHandler().getAttributeType(
sourceAttributeType.getOid() );
if ( targetAttributeType == null )
{
@@ -287,14 +291,14 @@ public class MergeSchemasWizard extends
else
{
// remove attribute type if already there from previous merge
- AttributeTypeImpl at = targetSchema.getAttributeType( sourceAttributeType.getOid() );
+ AttributeType at = targetSchema.getAttributeType( sourceAttributeType.getOid() );
if ( at != null )
{
targetSchema.removeAttributeType( at );
}
// clone attribute type
- AttributeTypeImpl clonedAttributeType = new AttributeTypeImpl( sourceAttributeType.getOid() );
+ AttributeType clonedAttributeType = new AttributeType( sourceAttributeType.getOid() );
clonedAttributeType.setNames( sourceAttributeType.getNames() );
clonedAttributeType.setDescription( sourceAttributeType.getDescription() );
clonedAttributeType.setSuperiorOid( sourceAttributeType.getSuperiorOid() );
@@ -309,7 +313,6 @@ public class MergeSchemasWizard extends
clonedAttributeType.setOrderingOid( sourceAttributeType.getOrderingOid() );
clonedAttributeType.setSubstringOid( sourceAttributeType.getSubstringOid() );
clonedAttributeType.setSchemaName( targetSchema.getName() );
- clonedAttributeType.setSchemaObject( targetSchema );
// if no/unknown syntax: set "Directory String" syntax and appropriate matching rules
if ( replaceUnknownSyntax )
@@ -338,8 +341,8 @@ public class MergeSchemasWizard extends
String superiorName = clonedAttributeType.getSuperiorOid();
if ( superiorName != null )
{
- AttributeTypeImpl superiorAttributeType = sourceAttributeType.getSchemaObject().getProject()
- .getSchemaHandler().getAttributeType( superiorName );
+ AttributeType superiorAttributeType = Activator.getDefault().getSchemaHandler()
+ .getAttributeType( superiorName );
if ( superiorAttributeType != null )
{
mergeAttributeType( superiorAttributeType, targetProject, targetSchema, processedObjects,
@@ -357,7 +360,7 @@ public class MergeSchemasWizard extends
/**
* Merges the given object class to the targetSchema.
*/
- private void mergeObjectClass( ObjectClassImpl sourceObjectClass, Project targetProject, Schema targetSchema,
+ private void mergeObjectClass( ObjectClass sourceObjectClass, Project targetProject, Schema targetSchema,
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
boolean mergeDependencies, boolean pullUpAttributes )
{
@@ -368,7 +371,7 @@ public class MergeSchemasWizard extends
processedObjects.add( sourceObjectClass );
// check if object class (identified by OID or alias name) already exists in the target project
- ObjectClassImpl targetObjectClass = targetProject.getSchemaHandler()
+ ObjectClass targetObjectClass = targetProject.getSchemaHandler()
.getObjectClass( sourceObjectClass.getOid() );
if ( targetObjectClass == null )
{
@@ -412,14 +415,14 @@ public class MergeSchemasWizard extends
else
{
// remove object class if already there from previous merge
- ObjectClassImpl oc = targetSchema.getObjectClass( sourceObjectClass.getOid() );
+ ObjectClass oc = targetSchema.getObjectClass( sourceObjectClass.getOid() );
if ( oc != null )
{
targetSchema.removeObjectClass( oc );
}
// create object class
- ObjectClassImpl clonedObjectClass = new ObjectClassImpl( sourceObjectClass.getOid() );
+ ObjectClass clonedObjectClass = new ObjectClass( sourceObjectClass.getOid() );
clonedObjectClass.setOid( sourceObjectClass.getOid() );
clonedObjectClass.setNames( sourceObjectClass.getNames() );
clonedObjectClass.setDescription( sourceObjectClass.getDescription() );
@@ -429,7 +432,6 @@ public class MergeSchemasWizard extends
clonedObjectClass.setMustAttributeTypeOids( sourceObjectClass.getMustAttributeTypeOids() );
clonedObjectClass.setMayAttributeTypeOids( sourceObjectClass.getMayAttributeTypeOids() );
clonedObjectClass.setSchemaName( targetSchema.getName() );
- clonedObjectClass.setSchemaObject( targetSchema );
// merge dependencies: super object classes and must/may attributes
if ( mergeDependencies )
@@ -441,9 +443,8 @@ public class MergeSchemasWizard extends
{
if ( superClassName != null )
{
- ObjectClassImpl superSourceObjectClass = sourceObjectClass.getSchemaObject()
- .getProject().getSchemaHandler().getObjectClass( superClassName );
- ObjectClassImpl superTargetObjectClass = targetProject.getSchemaHandler()
+ ObjectClass superSourceObjectClass = Activator.getDefault().getSchemaHandler().getObjectClass( superClassName );
+ ObjectClass superTargetObjectClass = targetProject.getSchemaHandler()
.getObjectClass( superClassName );
if ( superSourceObjectClass != null )
{
@@ -482,8 +483,7 @@ public class MergeSchemasWizard extends
{
if ( attributeName != null )
{
- AttributeTypeImpl attributeType = sourceObjectClass.getSchemaObject().getProject()
- .getSchemaHandler().getAttributeType( attributeName );
+ AttributeType attributeType = Activator.getDefault().getSchemaHandler().getAttributeType( attributeName );
if ( attributeType != null )
{
mergeAttributeType( attributeType, targetProject, targetSchema, processedObjects,
@@ -499,8 +499,8 @@ public class MergeSchemasWizard extends
}
- private void pullUpAttributes( ObjectClassImpl targetObjectClass, ObjectClassImpl sourceSuperObjectClass,
- ObjectClassImpl targetSuperObjectClass )
+ private void pullUpAttributes( ObjectClass targetObjectClass, ObjectClass sourceSuperObjectClass,
+ ObjectClass targetSuperObjectClass )
{
// must
Set<String> sourceMustAttributeNames = new HashSet<String>();
@@ -528,14 +528,14 @@ public class MergeSchemasWizard extends
}
- private void fetchAttributes( Set<String> attributeNameList, ObjectClassImpl oc, boolean must )
+ private void fetchAttributes( Set<String> attributeNameList, ObjectClass oc, boolean must )
{
List<String> attributeNames = must ? oc.getMustAttributeTypeOids() : oc.getMayAttributeTypeOids();
attributeNameList.addAll( attributeNames );
for ( String superClassName : oc.getSuperiorOids() )
{
- ObjectClassImpl superObjectClass = oc.getSchemaObject().getProject().getSchemaHandler().getObjectClass(
+ ObjectClass superObjectClass = Activator.getDefault().getSchemaHandler().getObjectClass(
superClassName );
fetchAttributes( attributeNameList, superObjectClass, must );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Wed Jan 26 19:25:22 2011
@@ -25,12 +25,12 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
import org.apache.directory.studio.schemaeditor.view.dialogs.AttributeTypeSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -129,7 +129,7 @@ public class NewAttributeTypeContentWiza
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
if ( dialog.open() == Dialog.OK )
{
- AttributeTypeImpl selectedAT = dialog.getSelectedAttributeType();
+ AttributeType selectedAT = dialog.getSelectedAttributeType();
List<String> aliases = selectedAT.getNames();
if ( ( aliases != null ) && ( aliases.size() > 0 ) )
{
@@ -175,9 +175,9 @@ public class NewAttributeTypeContentWiza
{
public String getText( Object element )
{
- if ( element instanceof SyntaxImpl )
+ if ( element instanceof LdapSyntax )
{
- SyntaxImpl syntax = ( SyntaxImpl ) element;
+ LdapSyntax syntax = ( LdapSyntax ) element;
String name = syntax.getName();
if ( name != null )
@@ -261,10 +261,10 @@ public class NewAttributeTypeContentWiza
{
public int compare( Object o1, Object o2 )
{
- if ( ( o1 instanceof SyntaxImpl ) && ( o2 instanceof SyntaxImpl ) )
+ if ( ( o1 instanceof LdapSyntax ) && ( o2 instanceof LdapSyntax ) )
{
- List<String> o1Names = ( ( SyntaxImpl ) o1 ).getNames();
- List<String> o2Names = ( ( SyntaxImpl ) o2 ).getNames();
+ List<String> o1Names = ( ( LdapSyntax ) o1 ).getNames();
+ List<String> o2Names = ( ( LdapSyntax ) o2 ).getNames();
// Comparing the First Name
if ( ( o1Names != null ) && ( o2Names != null ) )
@@ -283,11 +283,11 @@ public class NewAttributeTypeContentWiza
}
}
}
- else if ( ( o1 instanceof String ) && ( o2 instanceof SyntaxImpl ) )
+ else if ( ( o1 instanceof String ) && ( o2 instanceof LdapSyntax ) )
{
return Integer.MIN_VALUE;
}
- else if ( ( o1 instanceof SyntaxImpl ) && ( o2 instanceof String ) )
+ else if ( ( o1 instanceof LdapSyntax ) && ( o2 instanceof String ) )
{
return Integer.MAX_VALUE;
}
@@ -395,9 +395,9 @@ public class NewAttributeTypeContentWiza
{
Object selection = ( ( StructuredSelection ) syntaxComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof SyntaxImpl )
+ if ( selection instanceof LdapSyntax )
{
- return ( ( SyntaxImpl ) selection ).getOid();
+ return ( ( LdapSyntax ) selection ).getOid();
}
return null;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java Wed Jan 26 19:25:22 2011
@@ -25,10 +25,10 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.LabelProvider;
@@ -65,9 +65,9 @@ public class NewAttributeTypeMatchingRul
*/
public String getText( Object element )
{
- if ( element instanceof MatchingRuleImpl )
+ if ( element instanceof MatchingRule )
{
- MatchingRuleImpl mr = ( MatchingRuleImpl ) element;
+ MatchingRule mr = ( MatchingRule ) element;
String name = mr.getName();
if ( name != null )
@@ -176,10 +176,10 @@ public class NewAttributeTypeMatchingRul
public int compare( Object o1, Object o2 )
{
- if ( ( o1 instanceof MatchingRuleImpl ) && ( o2 instanceof MatchingRuleImpl ) )
+ if ( ( o1 instanceof MatchingRule ) && ( o2 instanceof MatchingRule ) )
{
- List<String> o1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
- List<String> o2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+ List<String> o1Names = ( ( MatchingRule ) o1 ).getNames();
+ List<String> o2Names = ( ( MatchingRule ) o2 ).getNames();
// Comparing the First Name
if ( ( o1Names != null ) && ( o2Names != null ) )
@@ -197,11 +197,11 @@ public class NewAttributeTypeMatchingRul
return o1Names.get( 0 ).compareToIgnoreCase( "" ); //$NON-NLS-1$
}
}
- else if ( ( o1 instanceof String ) && ( o2 instanceof MatchingRuleImpl ) )
+ else if ( ( o1 instanceof String ) && ( o2 instanceof MatchingRule ) )
{
return Integer.MIN_VALUE;
}
- else if ( ( o1 instanceof MatchingRuleImpl ) && ( o2 instanceof String ) )
+ else if ( ( o1 instanceof MatchingRule ) && ( o2 instanceof String ) )
{
return Integer.MAX_VALUE;
}
@@ -235,9 +235,9 @@ public class NewAttributeTypeMatchingRul
{
Object selection = ( ( StructuredSelection ) equalityComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof MatchingRuleImpl )
+ if ( selection instanceof MatchingRule )
{
- MatchingRuleImpl mr = ( ( MatchingRuleImpl ) selection );
+ MatchingRule mr = ( ( MatchingRule ) selection );
List<String> names = mr.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -264,9 +264,9 @@ public class NewAttributeTypeMatchingRul
{
Object selection = ( ( StructuredSelection ) orderingComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof MatchingRuleImpl )
+ if ( selection instanceof MatchingRule )
{
- MatchingRuleImpl mr = ( ( MatchingRuleImpl ) selection );
+ MatchingRule mr = ( ( MatchingRule ) selection );
List<String> names = mr.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -293,9 +293,9 @@ public class NewAttributeTypeMatchingRul
{
Object selection = ( ( StructuredSelection ) substringComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof MatchingRuleImpl )
+ if ( selection instanceof MatchingRule )
{
- MatchingRuleImpl mr = ( ( MatchingRuleImpl ) selection );
+ MatchingRule mr = ( ( MatchingRule ) selection );
List<String> names = mr.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java Wed Jan 26 19:25:22 2011
@@ -20,10 +20,10 @@
package org.apache.directory.studio.schemaeditor.view.wizards;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -73,9 +73,8 @@ public class NewAttributeTypeWizard exte
public boolean performFinish()
{
// Creating the new attribute type
- AttributeTypeImpl newAT = new AttributeTypeImpl( generalPage.getOidValue() );
+ AttributeType newAT = new AttributeType( generalPage.getOidValue() );
newAT.setSchemaName( generalPage.getSchemaValue() );
- newAT.setSchemaObject( Activator.getDefault().getSchemaHandler().getSchema( generalPage.getSchemaValue() ) );
newAT.setNames( generalPage.getAliasesValue() );
newAT.setDescription( generalPage.getDescriptionValue() );
newAT.setSuperiorOid( contentPage.getSuperiorValue() );
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java Wed Jan 26 19:25:22 2011
@@ -25,10 +25,10 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.dialogs.ObjectClassSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
@@ -64,7 +64,7 @@ import org.eclipse.swt.widgets.Table;
public class NewObjectClassContentWizardPage extends WizardPage
{
/** The superiors object classes */
- private List<ObjectClassImpl> superiorsList;
+ private List<ObjectClass> superiorsList;
/** The type of the object class */
private ObjectClassTypeEnum type = ObjectClassTypeEnum.STRUCTURAL;
@@ -88,7 +88,7 @@ public class NewObjectClassContentWizard
setTitle( Messages.getString( "NewObjectClassContentWizardPage.ObjectClassContent" ) ); //$NON-NLS-1$
setDescription( Messages.getString( "NewObjectClassContentWizardPage.EnterObjectClassContent" ) ); //$NON-NLS-1$
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
- superiorsList = new ArrayList<ObjectClassImpl>();
+ superiorsList = new ArrayList<ObjectClass>();
}
@@ -117,7 +117,7 @@ public class NewObjectClassContentWizard
{
public Image getImage( Object element )
{
- if ( element instanceof ObjectClassImpl )
+ if ( element instanceof ObjectClass )
{
return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
@@ -129,9 +129,9 @@ public class NewObjectClassContentWizard
public String getText( Object element )
{
- if ( element instanceof ObjectClassImpl )
+ if ( element instanceof ObjectClass )
{
- ObjectClassImpl oc = ( ObjectClassImpl ) element;
+ ObjectClass oc = ( ObjectClass ) element;
List<String> names = oc.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -280,9 +280,9 @@ public class NewObjectClassContentWizard
*/
private void updateSuperiorsTable()
{
- Collections.sort( superiorsList, new Comparator<ObjectClassImpl>()
+ Collections.sort( superiorsList, new Comparator<ObjectClass>()
{
- public int compare( ObjectClassImpl o1, ObjectClassImpl o2 )
+ public int compare( ObjectClass o1, ObjectClass o2 )
{
List<String> at1Names = o1.getNames();
List<String> at2Names = o2.getNames();
@@ -310,7 +310,7 @@ public class NewObjectClassContentWizard
public List<String> getSuperiorsNameValue()
{
List<String> names = new ArrayList<String>();
- for ( ObjectClassImpl oc : superiorsList )
+ for ( ObjectClass oc : superiorsList )
{
List<String> aliases = oc.getNames();
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java Wed Jan 26 19:25:22 2011
@@ -25,9 +25,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.dialogs.AttributeTypeSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
@@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Table;
public class NewObjectClassMandatoryAttributesPage extends WizardPage
{
/** The mandatory attribute types list */
- private List<AttributeTypeImpl> mandatoryAttributeTypesList;
+ private List<AttributeType> mandatoryAttributeTypesList;
// UI Fields
private TableViewer mandatoryAttributeTypesTableViewer;
@@ -79,7 +79,7 @@ public class NewObjectClassMandatoryAttr
setDescription( Messages
.getString( "NewObjectClassMandatoryAttributesPage.SpecifiyMandatoryAttributeTypeForObjectClass" ) ); //$NON-NLS-1$
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
- mandatoryAttributeTypesList = new ArrayList<AttributeTypeImpl>();
+ mandatoryAttributeTypesList = new ArrayList<AttributeType>();
}
@@ -110,7 +110,7 @@ public class NewObjectClassMandatoryAttr
{
public Image getImage( Object element )
{
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -122,9 +122,9 @@ public class NewObjectClassMandatoryAttr
public String getText( Object element )
{
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) element;
+ AttributeType at = ( AttributeType ) element;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -186,7 +186,7 @@ public class NewObjectClassMandatoryAttr
private void addMandatoryAttributeType()
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
- List<AttributeTypeImpl> hiddenAttributes = new ArrayList<AttributeTypeImpl>();
+ List<AttributeType> hiddenAttributes = new ArrayList<AttributeType>();
hiddenAttributes.addAll( mandatoryAttributeTypesList );
dialog.setHiddenAttributeTypes( hiddenAttributes );
if ( dialog.open() == Dialog.OK )
@@ -217,9 +217,9 @@ public class NewObjectClassMandatoryAttr
*/
private void updateMandatoryAttributeTypesTableTable()
{
- Collections.sort( mandatoryAttributeTypesList, new Comparator<AttributeTypeImpl>()
+ Collections.sort( mandatoryAttributeTypesList, new Comparator<AttributeType>()
{
- public int compare( AttributeTypeImpl o1, AttributeTypeImpl o2 )
+ public int compare( AttributeType o1, AttributeType o2 )
{
List<String> at1Names = o1.getNames();
List<String> at2Names = o2.getNames();
@@ -244,7 +244,7 @@ public class NewObjectClassMandatoryAttr
* @return
* the mandatory attributes types
*/
- public List<AttributeTypeImpl> getMandatoryAttributeTypes()
+ public List<AttributeType> getMandatoryAttributeTypes()
{
return mandatoryAttributeTypesList;
}
@@ -259,7 +259,7 @@ public class NewObjectClassMandatoryAttr
public List<String> getMandatoryAttributeTypesNames()
{
List<String> names = new ArrayList<String>();
- for ( AttributeTypeImpl at : mandatoryAttributeTypesList )
+ for ( AttributeType at : mandatoryAttributeTypesList )
{
names.add( at.getName() );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Wed Jan 26 19:25:22 2011
@@ -25,9 +25,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.dialogs.AttributeTypeSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
@@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Table;
public class NewObjectClassOptionalAttributesPage extends WizardPage
{
/** The optional attribute types list */
- private List<AttributeTypeImpl> optionalAttributeTypesList;
+ private List<AttributeType> optionalAttributeTypesList;
// UI Fields
private TableViewer optionalAttributeTypesTableViewer;
@@ -79,7 +79,7 @@ public class NewObjectClassOptionalAttri
setDescription( Messages
.getString( "NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass" ) ); //$NON-NLS-1$
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
- optionalAttributeTypesList = new ArrayList<AttributeTypeImpl>();
+ optionalAttributeTypesList = new ArrayList<AttributeType>();
}
@@ -110,7 +110,7 @@ public class NewObjectClassOptionalAttri
{
public Image getImage( Object element )
{
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -122,9 +122,9 @@ public class NewObjectClassOptionalAttri
public String getText( Object element )
{
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) element;
+ AttributeType at = ( AttributeType ) element;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -186,7 +186,7 @@ public class NewObjectClassOptionalAttri
private void addOptionalAttributeType()
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
- List<AttributeTypeImpl> hiddenAttributes = new ArrayList<AttributeTypeImpl>();
+ List<AttributeType> hiddenAttributes = new ArrayList<AttributeType>();
hiddenAttributes.addAll( optionalAttributeTypesList );
dialog.setHiddenAttributeTypes( hiddenAttributes );
if ( dialog.open() == Dialog.OK )
@@ -217,9 +217,9 @@ public class NewObjectClassOptionalAttri
*/
private void updateOptionalAttributeTypesTableTable()
{
- Collections.sort( optionalAttributeTypesList, new Comparator<AttributeTypeImpl>()
+ Collections.sort( optionalAttributeTypesList, new Comparator<AttributeType>()
{
- public int compare( AttributeTypeImpl o1, AttributeTypeImpl o2 )
+ public int compare( AttributeType o1, AttributeType o2 )
{
List<String> at1Names = o1.getNames();
List<String> at2Names = o2.getNames();
@@ -244,7 +244,7 @@ public class NewObjectClassOptionalAttri
* @return
* the optional attributes types
*/
- public List<AttributeTypeImpl> getOptionalAttributeTypes()
+ public List<AttributeType> getOptionalAttributeTypes()
{
return optionalAttributeTypesList;
}
@@ -259,7 +259,7 @@ public class NewObjectClassOptionalAttri
public List<String> getOptionalAttributeTypesNames()
{
List<String> names = new ArrayList<String>();
- for ( AttributeTypeImpl at : optionalAttributeTypesList )
+ for ( AttributeType at : optionalAttributeTypesList )
{
names.add( at.getName() );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java Wed Jan 26 19:25:22 2011
@@ -20,10 +20,10 @@
package org.apache.directory.studio.schemaeditor.view.wizards;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -76,9 +76,8 @@ public class NewObjectClassWizard extend
public boolean performFinish()
{
// Creating the new object class
- ObjectClassImpl newOC = new ObjectClassImpl( generalPage.getOidValue() );
+ ObjectClass newOC = new ObjectClass( generalPage.getOidValue() );
newOC.setSchemaName( generalPage.getSchemaValue() );
- newOC.setSchemaObject( Activator.getDefault().getSchemaHandler().getSchema( generalPage.getSchemaValue() ) );
newOC.setNames( generalPage.getAliasesValue() );
newOC.setDescription( generalPage.getDescriptionValue() );
newOC.setSuperiorOids( contentPage.getSuperiorsNameValue() );
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java Wed Jan 26 19:25:22 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.wrappers;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.eclipse.osgi.util.NLS;
@@ -32,7 +32,7 @@ import org.eclipse.osgi.util.NLS;
public class AttributeTypeWrapper extends AbstractTreeNode
{
/** The wrapped AttributeType */
- private AttributeTypeImpl attributeType;
+ private AttributeType attributeType;
/**
@@ -41,7 +41,7 @@ public class AttributeTypeWrapper extend
* @param at
* the wrapped AttributeType
*/
- public AttributeTypeWrapper( AttributeTypeImpl at )
+ public AttributeTypeWrapper( AttributeType at )
{
super( null );
attributeType = at;
@@ -56,7 +56,7 @@ public class AttributeTypeWrapper extend
* @param parent
* the parent TreeNode
*/
- public AttributeTypeWrapper( AttributeTypeImpl at, TreeNode parent )
+ public AttributeTypeWrapper( AttributeType at, TreeNode parent )
{
super( parent );
attributeType = at;
@@ -69,7 +69,7 @@ public class AttributeTypeWrapper extend
* @return
* the wrapped AttributeType
*/
- public AttributeTypeImpl getAttributeType()
+ public AttributeType getAttributeType()
{
return attributeType;
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java Wed Jan 26 19:25:22 2011
@@ -24,8 +24,8 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
/**
@@ -43,32 +43,32 @@ public class FirstNameSorter implements
if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
- AttributeTypeImpl at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
- AttributeTypeImpl at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+ AttributeType at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+ AttributeType at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
o1Names = at1.getNames();
o2Names = at2.getNames();
}
else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
{
- ObjectClassImpl oc1 = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
- ObjectClassImpl oc2 = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
+ ObjectClass oc1 = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
+ ObjectClass oc2 = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
o1Names = oc1.getNames();
o2Names = oc2.getNames();
}
else if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
{
- AttributeTypeImpl at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
- ObjectClassImpl oc = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
+ AttributeType at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+ ObjectClass oc = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
o1Names = at.getNames();
o2Names = oc.getNames();
}
else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
- ObjectClassImpl oc = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
- AttributeTypeImpl at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+ ObjectClass oc = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
+ AttributeType at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
o1Names = oc.getNames();
o2Names = at.getNames();
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java Wed Jan 26 19:25:22 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.wrappers;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.eclipse.osgi.util.NLS;
@@ -32,7 +32,7 @@ import org.eclipse.osgi.util.NLS;
public class ObjectClassWrapper extends AbstractTreeNode
{
/** The wrapped ObjectClass */
- private ObjectClassImpl objectClass;
+ private ObjectClass objectClass;
/**
@@ -41,7 +41,7 @@ public class ObjectClassWrapper extends
* @param oc
* the wrapped ObjectClass
*/
- public ObjectClassWrapper( ObjectClassImpl oc )
+ public ObjectClassWrapper( ObjectClass oc )
{
super( null );
objectClass = oc;
@@ -56,7 +56,7 @@ public class ObjectClassWrapper extends
* @param parent
* the parent TreeNode
*/
- public ObjectClassWrapper( ObjectClassImpl oc, TreeNode parent )
+ public ObjectClassWrapper( ObjectClass oc, TreeNode parent )
{
super( parent );
objectClass = oc;
@@ -69,7 +69,7 @@ public class ObjectClassWrapper extends
* @return
* the wrapped ObjectClass
*/
- public ObjectClassImpl getObjectClass()
+ public ObjectClass getObjectClass()
{
return objectClass;
}