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 [3/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/dialogs/AttributeTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java Wed Jan 26 19:25:22 2011
@@ -24,9 +24,9 @@ package org.apache.directory.studio.sche
import java.util.ArrayList;
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.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -62,10 +62,10 @@ import org.eclipse.ui.PlatformUI;
public class AttributeTypeSelectionDialog extends Dialog
{
/** The selected attribute type */
- private AttributeTypeImpl selectedAttributeType;
+ private AttributeType selectedAttributeType;
/** The hidden attribute types */
- private List<AttributeTypeImpl> hiddenAttributeTypes;
+ private List<AttributeType> hiddenAttributeTypes;
// UI Fields
private Text searchText;
@@ -82,7 +82,7 @@ public class AttributeTypeSelectionDialo
public AttributeTypeSelectionDialog()
{
super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
- hiddenAttributeTypes = new ArrayList<AttributeTypeImpl>();
+ hiddenAttributeTypes = new ArrayList<AttributeType>();
}
@@ -179,7 +179,7 @@ public class AttributeTypeSelectionDialo
chooseButton.setEnabled( true );
}
schemaIconLabel.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA ) );
- schemaNameLabel.setText( ( ( AttributeTypeImpl ) selection.getFirstElement() ).getSchemaName() );
+ schemaNameLabel.setText( ( ( AttributeType ) selection.getFirstElement() ).getSchemaName() );
}
}
} );
@@ -255,7 +255,7 @@ public class AttributeTypeSelectionDialo
}
else
{
- selectedAttributeType = ( AttributeTypeImpl ) selection.getFirstElement();
+ selectedAttributeType = ( AttributeType ) selection.getFirstElement();
}
super.okPressed();
@@ -268,7 +268,7 @@ public class AttributeTypeSelectionDialo
* @return
* the selected Attribute Type
*/
- public AttributeTypeImpl getSelectedAttributeType()
+ public AttributeType getSelectedAttributeType()
{
return selectedAttributeType;
}
@@ -280,7 +280,7 @@ public class AttributeTypeSelectionDialo
* @param list
* a list of Attribute Types to hide
*/
- public void setHiddenAttributeTypes( List<AttributeTypeImpl> list )
+ public void setHiddenAttributeTypes( List<AttributeType> list )
{
hiddenAttributeTypes = list;
}
@@ -292,9 +292,9 @@ public class AttributeTypeSelectionDialo
* @param attributeTypes
* an array of Attribute Types to hide
*/
- public void setHiddenAttributeTypes( AttributeTypeImpl[] attributeTypes )
+ public void setHiddenAttributeTypes( AttributeType[] attributeTypes )
{
- for ( AttributeTypeImpl objectClass : attributeTypes )
+ for ( AttributeType objectClass : attributeTypes )
{
hiddenAttributeTypes.add( objectClass );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java Wed Jan 26 19:25:22 2011
@@ -28,9 +28,9 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -46,13 +46,13 @@ public class AttributeTypeSelectionDialo
private SchemaHandler schemaHandler;
/** The hidden Object Classes */
- private List<AttributeTypeImpl> hiddenAttributeTypes;
+ private List<AttributeType> hiddenAttributeTypes;
/**
* Creates a new instance of AttributeTypeSelectionDialogContentProvider.
*/
- public AttributeTypeSelectionDialogContentProvider( List<AttributeTypeImpl> hiddenAttributeTypes )
+ public AttributeTypeSelectionDialogContentProvider( List<AttributeType> hiddenAttributeTypes )
{
this.hiddenAttributeTypes = hiddenAttributeTypes;
schemaHandler = Activator.getDefault().getSchemaHandler();
@@ -66,7 +66,7 @@ public class AttributeTypeSelectionDialo
{
if ( inputElement instanceof String )
{
- ArrayList<AttributeTypeImpl> results = new ArrayList<AttributeTypeImpl>();
+ ArrayList<AttributeType> results = new ArrayList<AttributeType>();
String searchText = ( String ) inputElement;
@@ -78,15 +78,15 @@ public class AttributeTypeSelectionDialo
Pattern pattern = Pattern.compile( searchRegexp, Pattern.CASE_INSENSITIVE );
- List<AttributeTypeImpl> atList = schemaHandler.getAttributeTypes();
+ List<AttributeType> atList = schemaHandler.getAttributeTypes();
// Sorting the list
- Collections.sort( atList, new Comparator<AttributeTypeImpl>()
+ Collections.sort( atList, new Comparator<AttributeType>()
{
- public int compare( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+ public int compare( AttributeType at1, AttributeType at2 )
{
- List<String> at1Names = ( ( AttributeTypeImpl ) at1 ).getNames();
- List<String> at2Names = ( ( AttributeTypeImpl ) at2 ).getNames();
+ List<String> at1Names = ( ( AttributeType ) at1 ).getNames();
+ List<String> at2Names = ( ( AttributeType ) at2 ).getNames();
if ( ( at1Names == null || at1Names.size() == 0 ) && ( at2Names == null || at2Names.size() == 0 ) )
{
@@ -110,7 +110,7 @@ public class AttributeTypeSelectionDialo
} );
// Searching for all matching elements
- for ( AttributeTypeImpl at : atList )
+ for ( AttributeType at : atList )
{
for ( String name : at.getNames() )
{
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,9 +23,9 @@ package org.apache.directory.studio.sche
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.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osgi.util.NLS;
@@ -44,7 +44,7 @@ public class AttributeTypeSelectionDialo
*/
public Image getImage( Object element )
{
- if ( element instanceof AttributeTypeImpl )
+ if ( element instanceof AttributeType )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -59,9 +59,9 @@ public class AttributeTypeSelectionDialo
*/
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 ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java Wed Jan 26 19:25:22 2011
@@ -24,9 +24,9 @@ package org.apache.directory.studio.sche
import java.util.ArrayList;
import java.util.List;
+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.ObjectClassImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -62,10 +62,10 @@ import org.eclipse.ui.PlatformUI;
public class ObjectClassSelectionDialog extends Dialog
{
/** The selected object class */
- private ObjectClassImpl selectedObjectClass;
+ private ObjectClass selectedObjectClass;
/** The hidden Object Classes */
- private List<ObjectClassImpl> hiddenObjectClasses;
+ private List<ObjectClass> hiddenObjectClasses;
// UI Fields
private Text searchText;
@@ -82,7 +82,7 @@ public class ObjectClassSelectionDialog
public ObjectClassSelectionDialog()
{
super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
- hiddenObjectClasses = new ArrayList<ObjectClassImpl>();
+ hiddenObjectClasses = new ArrayList<ObjectClass>();
}
@@ -179,7 +179,7 @@ public class ObjectClassSelectionDialog
chooseButton.setEnabled( true );
}
schemaIconLabel.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA ) );
- schemaNameLabel.setText( ( ( ObjectClassImpl ) selection.getFirstElement() ).getSchemaName() );
+ schemaNameLabel.setText( ( ( ObjectClass ) selection.getFirstElement() ).getSchemaName() );
}
}
} );
@@ -256,7 +256,7 @@ public class ObjectClassSelectionDialog
}
else
{
- selectedObjectClass = ( ObjectClassImpl ) selection.getFirstElement();
+ selectedObjectClass = ( ObjectClass ) selection.getFirstElement();
}
super.okPressed();
@@ -269,7 +269,7 @@ public class ObjectClassSelectionDialog
* @return
* the selected Object Class
*/
- public ObjectClassImpl getSelectedObjectClass()
+ public ObjectClass getSelectedObjectClass()
{
return selectedObjectClass;
}
@@ -281,7 +281,7 @@ public class ObjectClassSelectionDialog
* @param list
* a list of Object Classes to hide
*/
- public void setHiddenObjectClasses( List<ObjectClassImpl> list )
+ public void setHiddenObjectClasses( List<ObjectClass> list )
{
hiddenObjectClasses = list;
}
@@ -293,9 +293,9 @@ public class ObjectClassSelectionDialog
* @param objectClasses
* an array of Object Classes to hide
*/
- public void setHiddenObjectClasses( ObjectClassImpl[] objectClasses )
+ public void setHiddenObjectClasses( ObjectClass[] objectClasses )
{
- for ( ObjectClassImpl objectClass : objectClasses )
+ for ( ObjectClass objectClass : objectClasses )
{
hiddenObjectClasses.add( objectClass );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java Wed Jan 26 19:25:22 2011
@@ -28,9 +28,9 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -46,13 +46,13 @@ public class ObjectClassSelectionDialogC
private SchemaHandler schemaHandler;
/** The hidden object classes */
- private List<ObjectClassImpl> hiddenObjectClasses;
+ private List<ObjectClass> hiddenObjectClasses;
/**
* Creates a new instance of ObjectClassSelectionDialogContentProvider.
*/
- public ObjectClassSelectionDialogContentProvider( List<ObjectClassImpl> hiddenObjectClasses )
+ public ObjectClassSelectionDialogContentProvider( List<ObjectClass> hiddenObjectClasses )
{
schemaHandler = Activator.getDefault().getSchemaHandler();
this.hiddenObjectClasses = hiddenObjectClasses;
@@ -66,7 +66,7 @@ public class ObjectClassSelectionDialogC
{
if ( inputElement instanceof String )
{
- ArrayList<ObjectClassImpl> results = new ArrayList<ObjectClassImpl>();
+ ArrayList<ObjectClass> results = new ArrayList<ObjectClass>();
String searchText = ( String ) inputElement;
@@ -78,15 +78,15 @@ public class ObjectClassSelectionDialogC
Pattern pattern = Pattern.compile( searchRegexp, Pattern.CASE_INSENSITIVE );
- List<ObjectClassImpl> ocList = schemaHandler.getObjectClasses();
+ List<ObjectClass> ocList = schemaHandler.getObjectClasses();
// Sorting the list
- Collections.sort( ocList, new Comparator<ObjectClassImpl>()
+ Collections.sort( ocList, new Comparator<ObjectClass>()
{
- public int compare( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+ public int compare( ObjectClass oc1, ObjectClass oc2 )
{
- List<String> oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
- List<String> oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+ List<String> oc1Names = ( ( ObjectClass ) oc1 ).getNames();
+ List<String> oc2Names = ( ( ObjectClass ) oc2 ).getNames();
if ( ( oc1Names == null || oc1Names.size() == 0 ) && ( oc2Names == null || oc2Names.size() == 0 ) )
{
@@ -110,7 +110,7 @@ public class ObjectClassSelectionDialogC
} );
// Searching for all matching elements
- for ( ObjectClassImpl oc : ocList )
+ for ( ObjectClass oc : ocList )
{
for ( String name : oc.getNames() )
{
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,9 +23,9 @@ package org.apache.directory.studio.sche
import java.util.List;
+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.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osgi.util.NLS;
@@ -44,7 +44,7 @@ public class ObjectClassSelectionDialogL
*/
public Image getImage( Object element )
{
- if ( element instanceof ObjectClassImpl )
+ if ( element instanceof ObjectClass )
{
return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
@@ -59,9 +59,9 @@ public class ObjectClassSelectionDialogL
*/
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 ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java Wed Jan 26 19:25:22 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
@@ -39,19 +39,19 @@ public class ATEMatchingRulesComboCompar
*/
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof MatchingRuleImpl && o2 instanceof MatchingRuleImpl )
+ if ( o1 instanceof MatchingRule && o2 instanceof MatchingRule )
{
- List<String> mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
- List<String> mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+ List<String> mr1Names = ( ( MatchingRule ) o1 ).getNames();
+ List<String> mr2Names = ( ( MatchingRule ) o2 ).getNames();
if ( ( mr1Names != null ) && ( mr2Names != null ) && ( mr1Names.size() > 0 ) && ( mr2Names.size() > 0 ) )
{
return mr1Names.get( 0 ).compareToIgnoreCase( mr2Names.get( 0 ) );
}
}
- else if ( o1 instanceof MatchingRuleImpl && o2 instanceof NonExistingMatchingRule )
+ else if ( o1 instanceof MatchingRule && o2 instanceof NonExistingMatchingRule )
{
- List<String> mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
+ List<String> mr1Names = ( ( MatchingRule ) o1 ).getNames();
String mr2Name = ( ( NonExistingMatchingRule ) o2 ).getName();
if ( ( mr1Names != null ) && ( mr2Name != null ) && ( mr1Names.size() > 0 ) )
@@ -59,10 +59,10 @@ public class ATEMatchingRulesComboCompar
return mr1Names.get( 0 ).compareToIgnoreCase( mr2Name );
}
}
- else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRuleImpl )
+ else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRule )
{
String mr1Name = ( ( NonExistingMatchingRule ) o1 ).getName();
- List<String> mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+ List<String> mr2Names = ( ( MatchingRule ) o2 ).getNames();
if ( ( mr1Name != null ) && ( mr2Names != null ) && ( mr2Names.size() > 0 ) )
{
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java Wed Jan 26 19:25:22 2011
@@ -23,8 +23,8 @@ package org.apache.directory.studio.sche
import java.util.Collections;
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.model.MatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -52,9 +52,9 @@ public class ATEMatchingRulesComboConten
input.addChild( new NonExistingMatchingRule( NonExistingMatchingRule.NONE ) );
// Creating Children
- List<MatchingRuleImpl> equalityMatchingRules = Activator.getDefault().getSchemaHandler()
+ List<MatchingRule> equalityMatchingRules = Activator.getDefault().getSchemaHandler()
.getMatchingRules();
- for ( MatchingRuleImpl matchingRule : equalityMatchingRules )
+ for ( MatchingRule matchingRule : equalityMatchingRules )
{
input.addChild( matchingRule );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osgi.util.NLS;
@@ -38,9 +38,9 @@ public class ATEMatchingRulesComboLabelP
*/
public String getText( Object obj )
{
- if ( obj instanceof MatchingRuleImpl )
+ if ( obj instanceof MatchingRule )
{
- MatchingRuleImpl mr = ( MatchingRuleImpl ) obj;
+ MatchingRule mr = ( MatchingRule ) obj;
String name = mr.getName();
if ( name != null )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java Wed Jan 26 19:25:22 2011
@@ -23,7 +23,7 @@ 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.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
@@ -39,19 +39,19 @@ public class ATESuperiorComboComparator
*/
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
+ if ( o1 instanceof AttributeType && o2 instanceof AttributeType )
{
- List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
- List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+ List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
+ List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 ) && ( at2Names.size() > 0 ) )
{
return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
}
}
- else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
+ else if ( o1 instanceof AttributeType && o2 instanceof NonExistingAttributeType )
{
- List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+ List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.size() > 0 ) )
@@ -59,10 +59,10 @@ public class ATESuperiorComboComparator
return at1Names.get( 0 ).compareToIgnoreCase( at2Name );
}
}
- else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
+ else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeType )
{
String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
- List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+ List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.size() > 0 ) )
{
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java Wed Jan 26 19:25:22 2011
@@ -23,9 +23,9 @@ package org.apache.directory.studio.sche
import java.util.Collections;
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.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -62,14 +62,14 @@ public class ATESuperiorComboContentProv
if ( input.getChildren().isEmpty() )
{
- AttributeTypeImpl editorAT = input.getAttributeType();
+ AttributeType editorAT = input.getAttributeType();
// Creating the '(None)' item
input.addChild( new NonExistingAttributeType( NonExistingAttributeType.NONE ) );
// Creating Children
- List<AttributeTypeImpl> ats = schemaHandler.getAttributeTypes();
- for ( AttributeTypeImpl at : ats )
+ List<AttributeType> ats = schemaHandler.getAttributeTypes();
+ for ( AttributeType at : ats )
{
if ( !isSubType( at, editorAT ) )
{
@@ -118,7 +118,7 @@ public class ATESuperiorComboContentProv
* @return
* true if at1 is a sub type of at2
*/
- private boolean isSubType( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+ private boolean isSubType( AttributeType at1, AttributeType at2 )
{
if ( at1.equals( at2 ) )
{
@@ -134,7 +134,7 @@ public class ATESuperiorComboContentProv
}
else
{
- AttributeTypeImpl supAT = schemaHandler.getAttributeType( sup );
+ AttributeType supAT = schemaHandler.getAttributeType( sup );
if ( supAT == null )
{
return false;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java Wed Jan 26 19:25:22 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
/**
@@ -34,7 +34,7 @@ import org.apache.directory.studio.schem
public class ATESuperiorComboInput
{
/** The attribute type */
- private AttributeTypeImpl at;
+ private AttributeType at;
/** The children */
private List<Object> children;
@@ -46,7 +46,7 @@ public class ATESuperiorComboInput
* @param at
* the Attribute Type
*/
- public ATESuperiorComboInput( AttributeTypeImpl at )
+ public ATESuperiorComboInput( AttributeType at )
{
this.at = at;
}
@@ -58,7 +58,7 @@ public class ATESuperiorComboInput
* @return
* the attribute type
*/
- public AttributeTypeImpl getAttributeType()
+ public AttributeType getAttributeType()
{
return at;
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
import java.util.List;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
import org.eclipse.jface.viewers.LabelProvider;
@@ -41,9 +41,9 @@ public class ATESuperiorComboLabelProvid
*/
public String getText( Object obj )
{
- if ( obj instanceof AttributeTypeImpl )
+ if ( obj instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) obj;
+ AttributeType at = ( AttributeType ) obj;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java Wed Jan 26 19:25:22 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
@@ -39,10 +39,10 @@ public class ATESyntaxComboComparator im
*/
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof SyntaxImpl && o2 instanceof SyntaxImpl )
+ if ( o1 instanceof LdapSyntax && o2 instanceof LdapSyntax )
{
- List<String> syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
- List<String> syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
+ List<String> syntax1Names = ( ( LdapSyntax ) o1 ).getNames();
+ List<String> syntax2Names = ( ( LdapSyntax ) o2 ).getNames();
if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.size() > 0 )
&& ( syntax2Names.size() > 0 ) )
@@ -50,9 +50,9 @@ public class ATESyntaxComboComparator im
return syntax1Names.get( 0 ).compareToIgnoreCase( syntax2Names.get( 0 ) );
}
}
- else if ( o1 instanceof SyntaxImpl && o2 instanceof NonExistingSyntax )
+ else if ( o1 instanceof LdapSyntax && o2 instanceof NonExistingSyntax )
{
- List<String> syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
+ List<String> syntax1Names = ( ( LdapSyntax ) o1 ).getNames();
String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.size() > 0 ) )
@@ -60,10 +60,10 @@ public class ATESyntaxComboComparator im
return syntax1Names.get( 0 ).compareToIgnoreCase( syntax2Name );
}
}
- else if ( o1 instanceof NonExistingSyntax && o2 instanceof SyntaxImpl )
+ else if ( o1 instanceof NonExistingSyntax && o2 instanceof LdapSyntax )
{
String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
- List<String> syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
+ List<String> syntax2Names = ( ( LdapSyntax ) o2 ).getNames();
if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.size() > 0 ) )
{
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java Wed Jan 26 19:25:22 2011
@@ -23,8 +23,8 @@ package org.apache.directory.studio.sche
import java.util.Collections;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -52,8 +52,8 @@ public class ATESyntaxComboContentProvid
input.addChild( new NonExistingSyntax( NonExistingSyntax.NONE ) );
// Creating Children
- List<SyntaxImpl> syntaxes = Activator.getDefault().getSchemaHandler().getSyntaxes();
- for ( SyntaxImpl syntax : syntaxes )
+ List<LdapSyntax> syntaxes = Activator.getDefault().getSchemaHandler().getSyntaxes();
+ for ( LdapSyntax syntax : syntaxes )
{
input.addChild( syntax );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osgi.util.NLS;
@@ -38,9 +38,9 @@ public class ATESyntaxComboLabelProvider
*/
public String getText( Object obj )
{
- if ( obj instanceof SyntaxImpl )
+ if ( obj instanceof LdapSyntax )
{
- SyntaxImpl syntax = ( SyntaxImpl ) obj;
+ LdapSyntax syntax = ( LdapSyntax ) obj;
String name = syntax.getName();
if ( name != null )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.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.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
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.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -45,10 +45,10 @@ public class ATEUsedByMandatoryTableCont
*/
public Object[] getElements( Object inputElement )
{
- if ( inputElement instanceof AttributeTypeImpl )
+ if ( inputElement instanceof AttributeType )
{
- List<ObjectClassImpl> results = new ArrayList<ObjectClassImpl>();
- AttributeTypeImpl inputAT = ( AttributeTypeImpl ) inputElement;
+ List<ObjectClass> results = new ArrayList<ObjectClass>();
+ AttributeType inputAT = ( AttributeType ) inputElement;
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
List<String> names = new ArrayList<String>();
@@ -62,8 +62,8 @@ public class ATEUsedByMandatoryTableCont
}
}
- List<ObjectClassImpl> objectClasses = schemaHandler.getObjectClasses();
- for ( ObjectClassImpl oc : objectClasses )
+ List<ObjectClass> objectClasses = schemaHandler.getObjectClasses();
+ for ( ObjectClass oc : objectClasses )
{
List<String> musts = oc.getMustAttributeTypeOids();
if ( musts != null )
@@ -79,14 +79,14 @@ public class ATEUsedByMandatoryTableCont
}
// Sorting Results
- Collections.sort( results, new Comparator<ObjectClassImpl>()
+ Collections.sort( results, new Comparator<ObjectClass>()
{
- public int compare( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+ public int compare( ObjectClass oc1, ObjectClass oc2 )
{
- if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
+ if ( oc1 instanceof ObjectClass && oc1 instanceof ObjectClass )
{
- List<String> oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
- List<String> oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+ List<String> oc1Names = ( ( ObjectClass ) oc1 ).getNames();
+ List<String> oc2Names = ( ( ObjectClass ) oc2 ).getNames();
if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
&& ( oc2Names.size() > 0 ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.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.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
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.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -45,10 +45,10 @@ public class ATEUsedByOptionalTableConte
*/
public Object[] getElements( Object inputElement )
{
- if ( inputElement instanceof AttributeTypeImpl )
+ if ( inputElement instanceof AttributeType )
{
- List<ObjectClassImpl> results = new ArrayList<ObjectClassImpl>();
- AttributeTypeImpl inputAT = ( AttributeTypeImpl ) inputElement;
+ List<ObjectClass> results = new ArrayList<ObjectClass>();
+ AttributeType inputAT = ( AttributeType ) inputElement;
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
List<String> names = new ArrayList<String>();
@@ -62,8 +62,8 @@ public class ATEUsedByOptionalTableConte
}
}
- List<ObjectClassImpl> objectClasses = schemaHandler.getObjectClasses();
- for ( ObjectClassImpl oc : objectClasses )
+ List<ObjectClass> objectClasses = schemaHandler.getObjectClasses();
+ for ( ObjectClass oc : objectClasses )
{
List<String> mays = oc.getMayAttributeTypeOids();
if ( mays != null )
@@ -79,14 +79,14 @@ public class ATEUsedByOptionalTableConte
}
// Sorting Results
- Collections.sort( results, new Comparator<ObjectClassImpl>()
+ Collections.sort( results, new Comparator<ObjectClass>()
{
- public int compare( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+ public int compare( ObjectClass oc1, ObjectClass oc2 )
{
- if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
+ if ( oc1 instanceof ObjectClass && oc1 instanceof ObjectClass )
{
- List<String> oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
- List<String> oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+ List<String> oc1Names = ( ( ObjectClass ) oc1 ).getNames();
+ List<String> oc2Names = ( ( ObjectClass ) oc2 ).getNames();
if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
&& ( oc2Names.size() > 0 ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -21,9 +21,9 @@
package org.apache.directory.studio.schemaeditor.view.editors.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.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
@@ -42,7 +42,7 @@ public class ATEUsedByTablesLabelProvide
*/
public Image getColumnImage( Object element, int columnIndex )
{
- if ( element instanceof ObjectClassImpl )
+ if ( element instanceof ObjectClass )
{
return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
@@ -57,9 +57,9 @@ public class ATEUsedByTablesLabelProvide
*/
public String getColumnText( Object element, int columnIndex )
{
- if ( element instanceof ObjectClassImpl )
+ if ( element instanceof ObjectClass )
{
- return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNames() );
+ return ViewUtils.concateAliases( ( ( ObjectClass ) element ).getNames() );
}
// Default
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java Wed Jan 26 19:25:22 2011
@@ -21,6 +21,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
+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;
@@ -29,7 +30,6 @@ import org.apache.directory.studio.schem
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -69,10 +69,10 @@ public class AttributeTypeEditor extends
private AttributeTypeEditorUsedByPage usedBy;
/** The original attribute type */
- private AttributeTypeImpl originalAttributeType;
+ private AttributeType originalAttributeType;
/** The attribute type used to save modifications */
- private AttributeTypeImpl modifiedAttributeType;
+ private AttributeType modifiedAttributeType;
/** The originalSchema */
private Schema originalSchema;
@@ -254,7 +254,7 @@ public class AttributeTypeEditor extends
* @return
* the original attribute type
*/
- public AttributeTypeImpl getOriginalAttributeType()
+ public AttributeType getOriginalAttributeType()
{
return originalAttributeType;
}
@@ -266,7 +266,7 @@ public class AttributeTypeEditor extends
* @return
* the modified attribute type
*/
- public AttributeTypeImpl getModifiedAttributeType()
+ public AttributeType getModifiedAttributeType()
{
return modifiedAttributeType;
}
@@ -278,7 +278,7 @@ public class AttributeTypeEditor extends
* @param modifiedAttributeType
* the modified attribute type to set.
*/
- public void setModifiedAttributeType( AttributeTypeImpl modifiedAttributeType )
+ public void setModifiedAttributeType( AttributeType modifiedAttributeType )
{
this.modifiedAttributeType = modifiedAttributeType;
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Wed Jan 26 19:25:22 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.List;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
@@ -36,7 +36,7 @@ import org.eclipse.ui.IPersistableElemen
public class AttributeTypeEditorInput implements IEditorInput
{
/** The input attribute type */
- private AttributeTypeImpl attributeType;
+ private AttributeType attributeType;
/**
@@ -45,7 +45,7 @@ public class AttributeTypeEditorInput im
* @param at
* the input attribute type
*/
- public AttributeTypeEditorInput( AttributeTypeImpl at )
+ public AttributeTypeEditorInput( AttributeType at )
{
attributeType = at;
}
@@ -143,7 +143,7 @@ public class AttributeTypeEditorInput im
* @return
* the input Attribute Type
*/
- public AttributeTypeImpl getAttributeType()
+ public AttributeType getAttributeType()
{
return this.attributeType;
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Wed Jan 26 19:25:22 2011
@@ -25,16 +25,16 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.asn1.util.OID;
+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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
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.controller.SchemaHandlerListener;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
import org.apache.directory.studio.schemaeditor.model.alias.Alias;
import org.apache.directory.studio.schemaeditor.model.alias.AliasWithError;
import org.apache.directory.studio.schemaeditor.model.alias.AliasesStringParser;
@@ -91,10 +91,10 @@ public class AttributeTypeEditorOverview
public static final String ID = AttributeTypeEditor.ID + ".overviewPage"; //$NON-NLS-1$
/** The original object class */
- private AttributeTypeImpl originalAttributeType;
+ private AttributeType originalAttributeType;
/** The modified object class */
- private AttributeTypeImpl modifiedAttributeType;
+ private AttributeType modifiedAttributeType;
/** The original schema */
private Schema originalSchema;
@@ -108,7 +108,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeTypeImpl at )
+ public void attributeTypeAdded( AttributeType at )
{
refreshUI();
}
@@ -117,7 +117,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeTypeImpl at )
+ public void attributeTypeModified( AttributeType at )
{
refreshUI();
}
@@ -126,7 +126,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeTypeImpl at )
+ public void attributeTypeRemoved( AttributeType at )
{
if ( !at.equals( originalAttributeType ) )
{
@@ -138,7 +138,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#matchingRuleAdded(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
*/
- public void matchingRuleAdded( MatchingRuleImpl mr )
+ public void matchingRuleAdded( MatchingRule mr )
{
refreshUI();
}
@@ -147,7 +147,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#matchingRuleModified(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
*/
- public void matchingRuleModified( MatchingRuleImpl mr )
+ public void matchingRuleModified( MatchingRule mr )
{
refreshUI();
}
@@ -156,7 +156,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#matchingRuleRemoved(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
*/
- public void matchingRuleRemoved( MatchingRuleImpl mr )
+ public void matchingRuleRemoved( MatchingRule mr )
{
refreshUI();
}
@@ -165,7 +165,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
*/
- public void objectClassAdded( ObjectClassImpl oc )
+ public void objectClassAdded( ObjectClass oc )
{
refreshUI();
}
@@ -174,7 +174,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
*/
- public void objectClassModified( ObjectClassImpl oc )
+ public void objectClassModified( ObjectClass oc )
{
refreshUI();
}
@@ -183,7 +183,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
*/
- public void objectClassRemoved( ObjectClassImpl oc )
+ public void objectClassRemoved( ObjectClass oc )
{
refreshUI();
}
@@ -213,7 +213,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#syntaxAdded(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
*/
- public void syntaxAdded( SyntaxImpl syntax )
+ public void syntaxAdded( LdapSyntax syntax )
{
refreshUI();
}
@@ -222,7 +222,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#syntaxModified(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
*/
- public void syntaxModified( SyntaxImpl syntax )
+ public void syntaxModified( LdapSyntax syntax )
{
refreshUI();
}
@@ -231,7 +231,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#syntaxRemoved(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
*/
- public void syntaxRemoved( SyntaxImpl syntax )
+ public void syntaxRemoved( LdapSyntax syntax )
{
refreshUI();
}
@@ -323,7 +323,7 @@ public class AttributeTypeEditorOverview
String oid = oidText.getText();
- if ( OID.isOID(oid) )
+ if ( OID.isOID( oid ) )
{
if ( ( originalAttributeType.getOid().equals( oid ) )
|| !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )
@@ -397,11 +397,11 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) supComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof AttributeTypeImpl )
+ if ( selectedItem instanceof AttributeType )
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- AttributeTypeEditorInput input = new AttributeTypeEditorInput( ( AttributeTypeImpl ) selectedItem );
+ AttributeTypeEditorInput input = new AttributeTypeEditorInput( ( AttributeType ) selectedItem );
try
{
page.openEditor( input, AttributeTypeEditor.ID );
@@ -421,9 +421,9 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) supComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof AttributeTypeImpl )
+ if ( selectedItem instanceof AttributeType )
{
- AttributeTypeImpl at = ( AttributeTypeImpl ) selectedItem;
+ AttributeType at = ( AttributeType ) selectedItem;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
{
@@ -483,9 +483,9 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) syntaxComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof SyntaxImpl )
+ if ( selectedItem instanceof LdapSyntax )
{
- modifiedAttributeType.setSyntaxOid( ( ( SyntaxImpl ) selectedItem ).getOid() );
+ modifiedAttributeType.setSyntaxOid( ( ( LdapSyntax ) selectedItem ).getOid() );
}
else if ( selectedItem instanceof NonExistingSyntax )
{
@@ -580,9 +580,9 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) equalityComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof MatchingRuleImpl )
+ if ( selectedItem instanceof MatchingRule )
{
- modifiedAttributeType.setEqualityOid( ( ( MatchingRuleImpl ) selectedItem ).getName() );
+ modifiedAttributeType.setEqualityOid( ( ( MatchingRule ) selectedItem ).getName() );
}
else if ( selectedItem instanceof NonExistingMatchingRule )
{
@@ -608,9 +608,9 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) orderingComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof MatchingRuleImpl )
+ if ( selectedItem instanceof MatchingRule )
{
- modifiedAttributeType.setOrderingOid( ( ( MatchingRuleImpl ) selectedItem ).getName() );
+ modifiedAttributeType.setOrderingOid( ( ( MatchingRule ) selectedItem ).getName() );
}
else if ( selectedItem instanceof NonExistingMatchingRule )
{
@@ -636,9 +636,9 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) substringComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof MatchingRuleImpl )
+ if ( selectedItem instanceof MatchingRule )
{
- modifiedAttributeType.setSubstringOid( ( ( MatchingRuleImpl ) selectedItem ).getName() );
+ modifiedAttributeType.setSubstringOid( ( ( MatchingRule ) selectedItem ).getName() );
}
else if ( selectedItem instanceof NonExistingMatchingRule )
{
@@ -991,7 +991,7 @@ public class AttributeTypeEditorOverview
}
else
{
- AttributeTypeImpl supAT = schemaHandler.getAttributeType( supAtName );
+ AttributeType supAT = schemaHandler.getAttributeType( supAtName );
if ( supAT != null )
{
supComboViewer.setSelection( new StructuredSelection( supAT ), true );
@@ -1050,7 +1050,7 @@ public class AttributeTypeEditorOverview
}
else
{
- SyntaxImpl syntax = schemaHandler.getSyntax( syntaxOID );
+ LdapSyntax syntax = schemaHandler.getSyntax( syntaxOID );
if ( syntax != null )
{
syntaxComboViewer.setSelection( new StructuredSelection( syntax ), true );
@@ -1085,7 +1085,7 @@ public class AttributeTypeEditorOverview
}
else
{
- MatchingRuleImpl matchingRule = schemaHandler.getMatchingRule( equalityName );
+ MatchingRule matchingRule = schemaHandler.getMatchingRule( equalityName );
if ( matchingRule != null )
{
equalityComboViewer.setSelection( new StructuredSelection( matchingRule ), true );
@@ -1120,7 +1120,7 @@ public class AttributeTypeEditorOverview
}
else
{
- MatchingRuleImpl matchingRule = schemaHandler.getMatchingRule( orderingName );
+ MatchingRule matchingRule = schemaHandler.getMatchingRule( orderingName );
if ( matchingRule != null )
{
orderingComboViewer.setSelection( new StructuredSelection( matchingRule ), true );
@@ -1156,7 +1156,7 @@ public class AttributeTypeEditorOverview
}
else
{
- MatchingRuleImpl matchingRule = schemaHandler.getMatchingRule( substringName );
+ MatchingRule matchingRule = schemaHandler.getMatchingRule( substringName );
if ( matchingRule != null )
{
substringComboViewer.setSelection( new StructuredSelection( matchingRule ), true );
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Wed Jan 26 19:25:22 2011
@@ -28,7 +28,6 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
import org.apache.directory.studio.schemaeditor.view.widget.SchemaSourceViewer;
import org.eclipse.jface.resource.JFaceResources;
@@ -57,7 +56,7 @@ public class AttributeTypeEditorSourceCo
public static final String ID = AttributeTypeEditor.ID + "sourceCodePage"; //$NON-NLS-1$
/** The modified attribute type */
- private AttributeTypeImpl modifiedAttributeType;
+ private AttributeType modifiedAttributeType;
/** The Schema Source Viewer */
private SchemaSourceViewer schemaSourceViewer;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Wed Jan 26 19:25:22 2011
@@ -23,13 +23,13 @@ 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.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
-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.apache.directory.studio.schemaeditor.view.editors.objectclass.ObjectClassEditor;
@@ -65,10 +65,10 @@ public class AttributeTypeEditorUsedByPa
public static final String ID = AttributeTypeEditor.ID + "usedByPage"; //$NON-NLS-1$
/** The modified attribute type */
- private AttributeTypeImpl modifiedAttributeType;
+ private AttributeType modifiedAttributeType;
/** The original attribute type */
- private AttributeTypeImpl originalAttributeType;
+ private AttributeType originalAttributeType;
/** The Schema Handler */
private SchemaHandler schemaHandler;
@@ -79,7 +79,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeTypeImpl at )
+ public void attributeTypeAdded( AttributeType at )
{
refreshTableViewers();
}
@@ -88,7 +88,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeTypeImpl at )
+ public void attributeTypeModified( AttributeType at )
{
refreshTableViewers();
}
@@ -97,7 +97,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeTypeImpl at )
+ public void attributeTypeRemoved( AttributeType at )
{
refreshTableViewers();
}
@@ -106,7 +106,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
*/
- public void objectClassAdded( ObjectClassImpl oc )
+ public void objectClassAdded( ObjectClass oc )
{
refreshTableViewers();
}
@@ -115,7 +115,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
*/
- public void objectClassModified( ObjectClassImpl oc )
+ public void objectClassModified( ObjectClass oc )
{
refreshTableViewers();
}
@@ -124,7 +124,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
*/
- public void objectClassRemoved( ObjectClassImpl oc )
+ public void objectClassRemoved( ObjectClass oc )
{
refreshTableViewers();
}
@@ -163,12 +163,12 @@ public class AttributeTypeEditorUsedByPa
Object selectedItem = ( ( StructuredSelection ) mandatoryAttributeTableViewer.getSelection() )
.getFirstElement();
- if ( selectedItem instanceof ObjectClassImpl )
+ if ( selectedItem instanceof ObjectClass )
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new ObjectClassEditorInput( ( ObjectClassImpl ) selectedItem ),
+ page.openEditor( new ObjectClassEditorInput( ( ObjectClass ) selectedItem ),
ObjectClassEditor.ID );
}
catch ( PartInitException exception )
@@ -187,12 +187,12 @@ public class AttributeTypeEditorUsedByPa
Object selectedItem = ( ( StructuredSelection ) optionalAttibuteTableViewer.getSelection() )
.getFirstElement();
- if ( selectedItem instanceof ObjectClassImpl )
+ if ( selectedItem instanceof ObjectClass )
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new ObjectClassEditorInput( ( ObjectClassImpl ) selectedItem ),
+ page.openEditor( new ObjectClassEditorInput( ( ObjectClass ) selectedItem ),
ObjectClassEditor.ID );
}
catch ( PartInitException exception )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java Wed Jan 26 19:25:22 2011
@@ -21,6 +21,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
+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;
@@ -29,7 +30,6 @@ import org.apache.directory.studio.schem
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -68,10 +68,10 @@ public class ObjectClassEditor extends F
private boolean dirty = false;
/** The original object class */
- private ObjectClassImpl originalObjectClass;
+ private ObjectClass originalObjectClass;
/** The object class used to save modifications */
- private ObjectClassImpl modifiedObjectClass;
+ private ObjectClass modifiedObjectClass;
/** The originalSchema */
private Schema originalSchema;
@@ -251,7 +251,7 @@ public class ObjectClassEditor extends F
* @return
* the original object class
*/
- public ObjectClassImpl getOriginalObjectClass()
+ public ObjectClass getOriginalObjectClass()
{
return originalObjectClass;
}
@@ -263,7 +263,7 @@ public class ObjectClassEditor extends F
* @return
* the modified object class
*/
- public ObjectClassImpl getModifiedObjectClass()
+ public ObjectClass getModifiedObjectClass()
{
return modifiedObjectClass;
}
@@ -275,7 +275,7 @@ public class ObjectClassEditor extends F
* @param modifiedObjectClass
* the modified object class to set.
*/
- public void setModifiedObjectClass( ObjectClassImpl modifiedObjectClass )
+ public void setModifiedObjectClass( ObjectClass modifiedObjectClass )
{
this.modifiedObjectClass = modifiedObjectClass;
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.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.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -65,7 +65,7 @@ public class ObjectClassEditorAttributes
List<String> attributes = ( List<String> ) inputElement;
for ( String attribute : attributes )
{
- AttributeTypeImpl at = schemaHandler.getAttributeType( attribute );
+ AttributeType at = schemaHandler.getAttributeType( attribute );
if ( at != null )
{
results.add( at );
@@ -81,10 +81,10 @@ public class ObjectClassEditorAttributes
{
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
+ if ( o1 instanceof AttributeType && o2 instanceof AttributeType )
{
- List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
- List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+ List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
+ List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 )
&& ( at2Names.size() > 0 ) )
@@ -92,9 +92,9 @@ public class ObjectClassEditorAttributes
return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
}
}
- else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
+ else if ( o1 instanceof AttributeType && o2 instanceof NonExistingAttributeType )
{
- List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+ List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.size() > 0 ) )
@@ -102,10 +102,10 @@ public class ObjectClassEditorAttributes
return at1Names.get( 0 ).compareToIgnoreCase( at2Name );
}
}
- else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
+ else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeType )
{
String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
- List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+ List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.size() > 0 ) )
{