Author: pamarcelot
Date: Thu Mar 22 08:01:34 2007
New Revision: 521301
URL: http://svn.apache.org/viewvc?view=rev&rev=521301
Log:
Refactored the name of the Editors classes.
Added:
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditor.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditor.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorInput.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorInput.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorOverviewPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorSourceCodePage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorSourceCodePage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorUsedByPage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorUsedByPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditor.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditor.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorInput.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorInput.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorOverviewPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSourceCodePage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSourceCodePage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSuperiorsTableContentProvider.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSuperiorsTableContentProvider.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSuperiorsTableLabelProvider.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSuperiorsTableLabelProvider.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaEditor.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditor.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaEditorInput.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditorInput.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaEditorOverviewPage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditorOverviewPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaEditorSourceCodePage.java
- copied, changed from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditorSourceCodePage.java
Removed:
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditor.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorInput.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorOverviewPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorSourceCodePage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorUsedByPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditor.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorInput.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorOverviewPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSourceCodePage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSuperiorsTableContentProvider.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSuperiorsTableLabelProvider.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditor.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditorInput.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditorOverviewPage.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/schema/SchemaFormEditorSourceCodePage.java
Modified:
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenTypeHierarchyAction.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/ObjectClass.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchView.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizard.java
directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizard.java
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties Thu Mar 22 08:01:34 2007
@@ -51,9 +51,9 @@
ldapstudio-schemas-plugin.commands.createanewattributetype.description=Creates a new attribute type
ldapstudio-schemas-plugin.commands.category.name=LDAPStudio Category
-ldapstudio-schemas-plugin.editors.objectclassformeditor.name=Object Class Form Editor
-ldapstudio-schemas-plugin.editors.attributetypeformeditor.name=Attribute Type Form Editor
-ldapstudio-schemas-plugin.editors.schemaformeditor.name=Schema Form Editor
+ldapstudio-schemas-plugin.editors.objectclasseditor.name=Object Class Editor
+ldapstudio-schemas-plugin.editors.attributetypeeditor.name=Attribute Type Editor
+ldapstudio-schemas-plugin.editors.schemaeditor.name=Schema Editor
ldapstudio-schemas-plugin.wizards.category.name=Schemas Editor
ldapstudio-schemas-plugin.wizards.createanewschema.name=Create a new schema
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml Thu Mar 22 08:01:34 2007
@@ -138,23 +138,23 @@
<extension
point="org.eclipse.ui.editors">
<editor
- class="org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor"
+ class="org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor"
default="false"
icon="ressources/icons/object_class.gif"
id="org.apache.directory.ldapstudio.schemas.view.objectClassEditor"
- name="%ldapstudio-schemas-plugin.editors.objectclassformeditor.name"/>
+ name="%ldapstudio-schemas-plugin.editors.objectclasseditor.name"/>
<editor
- class="org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor"
+ class="org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor"
default="false"
icon="ressources/icons/attribute_type.gif"
id="org.apache.directory.ldapstudio.schemas.view.attributeTypeEditor"
- name="%ldapstudio-schemas-plugin.editors.attributetypeformeditor.name"/>
+ name="%ldapstudio-schemas-plugin.editors.attributetypeeditor.name"/>
<editor
- class="org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditor"
+ class="org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditor"
default="false"
icon="ressources/icons/schema.gif"
id="org.apache.directory.ldapstudio.schemas.view.schemaformeditor"
- name="%ldapstudio-schemas-plugin.editors.schemaformeditor.name"/>
+ name="%ldapstudio-schemas-plugin.editors.schemaeditor.name"/>
</extension>
<extension
point="org.eclipse.ui.newWizards">
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java Thu Mar 22 08:01:34 2007
@@ -33,10 +33,10 @@
import org.apache.directory.ldapstudio.schemas.model.LDAPModelEvent;
import org.apache.directory.ldapstudio.schemas.model.PoolListener;
import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditorInput;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditorInput;
import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper;
@@ -177,15 +177,15 @@
// Selecting the right editor and input
if ( objectSelection instanceof AttributeTypeWrapper )
{
- input = new AttributeTypeFormEditorInput( ( ( AttributeTypeWrapper ) objectSelection )
+ input = new AttributeTypeEditorInput( ( ( AttributeTypeWrapper ) objectSelection )
.getMyAttributeType() );
- editorId = AttributeTypeFormEditor.ID;
+ editorId = AttributeTypeEditor.ID;
}
else if ( objectSelection instanceof ObjectClassWrapper )
{
- input = new ObjectClassFormEditorInput( ( ( ObjectClassWrapper ) objectSelection )
+ input = new ObjectClassEditorInput( ( ( ObjectClassWrapper ) objectSelection )
.getMyObjectClass() );
- editorId = ObjectClassFormEditor.ID;
+ editorId = ObjectClassEditor.ID;
}
// Let's open the editor
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java Thu Mar 22 08:01:34 2007
@@ -32,10 +32,10 @@
import org.apache.directory.ldapstudio.schemas.controller.actions.OpenSchemaElementsViewSortDialogAction;
import org.apache.directory.ldapstudio.schemas.controller.actions.OpenTypeHierarchyAction;
import org.apache.directory.ldapstudio.schemas.controller.actions.OpenSchemaElementsViewPreferencesAction;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditorInput;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditorInput;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode;
@@ -190,15 +190,15 @@
// Selecting the right editor and input
if ( objectSelection instanceof AttributeTypeWrapper )
{
- input = new AttributeTypeFormEditorInput( ( ( AttributeTypeWrapper ) objectSelection )
+ input = new AttributeTypeEditorInput( ( ( AttributeTypeWrapper ) objectSelection )
.getMyAttributeType() );
- editorId = AttributeTypeFormEditor.ID;
+ editorId = AttributeTypeEditor.ID;
}
else if ( objectSelection instanceof ObjectClassWrapper )
{
- input = new ObjectClassFormEditorInput( ( ( ObjectClassWrapper ) objectSelection )
+ input = new ObjectClassEditorInput( ( ( ObjectClassWrapper ) objectSelection )
.getMyObjectClass() );
- editorId = ObjectClassFormEditor.ID;
+ editorId = ObjectClassEditor.ID;
}
else if ( objectSelection instanceof IntermediateNode )
{
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java Thu Mar 22 08:01:34 2007
@@ -44,10 +44,10 @@
import org.apache.directory.ldapstudio.schemas.model.SchemaCreationException;
import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
import org.apache.directory.ldapstudio.schemas.model.Schema.SchemaType;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditorInput;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditorInput;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode;
@@ -394,15 +394,15 @@
// Selecting the right editor and input
if ( objectSelection instanceof AttributeTypeWrapper )
{
- input = new AttributeTypeFormEditorInput( ( ( AttributeTypeWrapper ) objectSelection )
+ input = new AttributeTypeEditorInput( ( ( AttributeTypeWrapper ) objectSelection )
.getMyAttributeType() );
- editorId = AttributeTypeFormEditor.ID;
+ editorId = AttributeTypeEditor.ID;
}
else if ( objectSelection instanceof ObjectClassWrapper )
{
- input = new ObjectClassFormEditorInput( ( ( ObjectClassWrapper ) objectSelection )
+ input = new ObjectClassEditorInput( ( ( ObjectClassWrapper ) objectSelection )
.getMyObjectClass() );
- editorId = ObjectClassFormEditor.ID;
+ editorId = ObjectClassEditor.ID;
}
else if ( ( objectSelection instanceof IntermediateNode )
|| ( objectSelection instanceof SchemaWrapper ) )
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java Thu Mar 22 08:01:34 2007
@@ -25,8 +25,8 @@
import org.apache.directory.ldapstudio.schemas.model.AttributeType;
import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.IEditorPart;
@@ -62,13 +62,13 @@
{
IWorkbenchPart part = partRef.getPart( true );
- if ( part instanceof ObjectClassFormEditor )
+ if ( part instanceof ObjectClassEditor )
{
- linkViewWithEditor( ( ( ObjectClassFormEditor ) part ).getOriginalObjectClass() );
+ linkViewWithEditor( ( ( ObjectClassEditor ) part ).getOriginalObjectClass() );
}
- else if ( part instanceof AttributeTypeFormEditor )
+ else if ( part instanceof AttributeTypeEditor )
{
- linkViewWithEditor( ( ( AttributeTypeFormEditor ) part ).getOriginalAttributeType() );
+ linkViewWithEditor( ( ( AttributeTypeEditor ) part ).getOriginalAttributeType() );
}
}
@@ -177,13 +177,13 @@
IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.getActiveEditor();
- if ( activeEditor instanceof ObjectClassFormEditor )
+ if ( activeEditor instanceof ObjectClassEditor )
{
- linkViewWithEditor( ( ( ObjectClassFormEditor ) activeEditor ).getOriginalObjectClass() );
+ linkViewWithEditor( ( ( ObjectClassEditor ) activeEditor ).getOriginalObjectClass() );
}
- else if ( activeEditor instanceof AttributeTypeFormEditor )
+ else if ( activeEditor instanceof AttributeTypeEditor )
{
- linkViewWithEditor( ( ( AttributeTypeFormEditor ) activeEditor ).getOriginalAttributeType() );
+ linkViewWithEditor( ( ( AttributeTypeEditor ) activeEditor ).getOriginalAttributeType() );
}
}
else
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java Thu Mar 22 08:01:34 2007
@@ -25,8 +25,8 @@
import org.apache.directory.ldapstudio.schemas.model.AttributeType;
import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ITreeNode;
@@ -72,16 +72,16 @@
{
IWorkbenchPart part = partRef.getPart( true );
- if ( part instanceof ObjectClassFormEditor )
+ if ( part instanceof ObjectClassEditor )
{
view.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( ObjectClassFormEditor ) part ).getOriginalObjectClass() );
+ linkViewWithEditor( ( ( ObjectClassEditor ) part ).getOriginalObjectClass() );
view.getSite().getPage().addPostSelectionListener( viewListener );
}
- else if ( part instanceof AttributeTypeFormEditor )
+ else if ( part instanceof AttributeTypeEditor )
{
view.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( AttributeTypeFormEditor ) part ).getOriginalAttributeType() );
+ linkViewWithEditor( ( ( AttributeTypeEditor ) part ).getOriginalAttributeType() );
view.getSite().getPage().addPostSelectionListener( viewListener );
}
}
@@ -212,13 +212,13 @@
IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.getActiveEditor();
- if ( activeEditor instanceof ObjectClassFormEditor )
+ if ( activeEditor instanceof ObjectClassEditor )
{
- linkViewWithEditor( ( ( ObjectClassFormEditor ) activeEditor ).getOriginalObjectClass() );
+ linkViewWithEditor( ( ( ObjectClassEditor ) activeEditor ).getOriginalObjectClass() );
}
- else if ( activeEditor instanceof AttributeTypeFormEditor )
+ else if ( activeEditor instanceof AttributeTypeEditor )
{
- linkViewWithEditor( ( ( AttributeTypeFormEditor ) activeEditor ).getOriginalAttributeType() );
+ linkViewWithEditor( ( ( AttributeTypeEditor ) activeEditor ).getOriginalAttributeType() );
}
view.getSite().getPage().addPostSelectionListener( viewListener );
@@ -333,19 +333,19 @@
{
IWorkbenchPart workbenchPart = reference.getPart( true );
- if ( ( workbenchPart instanceof ObjectClassFormEditor ) && ( wrapper instanceof ObjectClassWrapper ) )
+ if ( ( workbenchPart instanceof ObjectClassEditor ) && ( wrapper instanceof ObjectClassWrapper ) )
{
- if ( ( ( ObjectClassFormEditor ) workbenchPart ).getOriginalObjectClass().equals(
+ if ( ( ( ObjectClassEditor ) workbenchPart ).getOriginalObjectClass().equals(
( ( ObjectClassWrapper ) wrapper ).getMyObjectClass() ) )
{
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop( workbenchPart );
return;
}
}
- else if ( ( workbenchPart instanceof AttributeTypeFormEditor )
+ else if ( ( workbenchPart instanceof AttributeTypeEditor )
&& ( wrapper instanceof AttributeTypeWrapper ) )
{
- if ( ( ( AttributeTypeFormEditor ) workbenchPart ).getOriginalAttributeType().equals(
+ if ( ( ( AttributeTypeEditor ) workbenchPart ).getOriginalAttributeType().equals(
( ( AttributeTypeWrapper ) wrapper ).getMyAttributeType() ) )
{
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop( workbenchPart );
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java Thu Mar 22 08:01:34 2007
@@ -25,9 +25,9 @@
import org.apache.directory.ldapstudio.schemas.model.AttributeType;
import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
import org.apache.directory.ldapstudio.schemas.model.Schema;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditor;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ITreeNode;
@@ -73,22 +73,22 @@
{
IWorkbenchPart part = partRef.getPart( true );
- if ( part instanceof ObjectClassFormEditor )
+ if ( part instanceof ObjectClassEditor )
{
schemasView.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( ObjectClassFormEditor ) part ).getOriginalObjectClass() );
+ linkViewWithEditor( ( ( ObjectClassEditor ) part ).getOriginalObjectClass() );
schemasView.getSite().getPage().addPostSelectionListener( viewListener );
}
- else if ( part instanceof AttributeTypeFormEditor )
+ else if ( part instanceof AttributeTypeEditor )
{
schemasView.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( AttributeTypeFormEditor ) part ).getOriginalAttributeType() );
+ linkViewWithEditor( ( ( AttributeTypeEditor ) part ).getOriginalAttributeType() );
schemasView.getSite().getPage().addPostSelectionListener( viewListener );
}
- else if ( part instanceof SchemaFormEditor )
+ else if ( part instanceof SchemaEditor )
{
schemasView.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( SchemaFormEditor ) part ).getSchema() );
+ linkViewWithEditor( ( ( SchemaEditor ) part ).getSchema() );
schemasView.getSite().getPage().addPostSelectionListener( viewListener );
}
}
@@ -219,22 +219,22 @@
IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.getActiveEditor();
- if ( activeEditor instanceof ObjectClassFormEditor )
+ if ( activeEditor instanceof ObjectClassEditor )
{
schemasView.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( ObjectClassFormEditor ) activeEditor ).getOriginalObjectClass() );
+ linkViewWithEditor( ( ( ObjectClassEditor ) activeEditor ).getOriginalObjectClass() );
schemasView.getSite().getPage().addPostSelectionListener( viewListener );
}
- else if ( activeEditor instanceof AttributeTypeFormEditor )
+ else if ( activeEditor instanceof AttributeTypeEditor )
{
schemasView.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( AttributeTypeFormEditor ) activeEditor ).getOriginalAttributeType() );
+ linkViewWithEditor( ( ( AttributeTypeEditor ) activeEditor ).getOriginalAttributeType() );
schemasView.getSite().getPage().addPostSelectionListener( viewListener );
}
- else if ( activeEditor instanceof SchemaFormEditor )
+ else if ( activeEditor instanceof SchemaEditor )
{
schemasView.getSite().getPage().removePostSelectionListener( viewListener );
- linkViewWithEditor( ( ( SchemaFormEditor ) activeEditor ).getSchema() );
+ linkViewWithEditor( ( ( SchemaEditor ) activeEditor ).getSchema() );
schemasView.getSite().getPage().addPostSelectionListener( viewListener );
}
@@ -352,11 +352,11 @@
{
IWorkbenchPart workbenchPart = reference.getPart( true );
- if ( ( ( workbenchPart instanceof ObjectClassFormEditor ) && ( wrapper instanceof ObjectClassWrapper ) && ( reference
+ if ( ( ( workbenchPart instanceof ObjectClassEditor ) && ( wrapper instanceof ObjectClassWrapper ) && ( reference
.getPartName().equals( ( ( ObjectClassWrapper ) wrapper ).getMyObjectClass().getNames()[0] ) ) )
- || ( ( workbenchPart instanceof AttributeTypeFormEditor ) && ( wrapper instanceof AttributeTypeWrapper ) && ( reference
+ || ( ( workbenchPart instanceof AttributeTypeEditor ) && ( wrapper instanceof AttributeTypeWrapper ) && ( reference
.getPartName().equals( ( ( AttributeTypeWrapper ) wrapper ).getMyAttributeType().getNames()[0] ) ) )
- || ( ( workbenchPart instanceof SchemaFormEditor ) && ( wrapper instanceof SchemaWrapper ) && ( reference
+ || ( ( workbenchPart instanceof SchemaEditor ) && ( wrapper instanceof SchemaWrapper ) && ( reference
.getPartName().equals( ( ( SchemaWrapper ) wrapper ).getMySchema().getName() ) ) ) )
{
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop( workbenchPart );
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java Thu Mar 22 08:01:34 2007
@@ -23,9 +23,9 @@
import org.apache.directory.ldapstudio.schemas.Activator;
import org.apache.directory.ldapstudio.schemas.PluginConstants;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditorInput;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditorSourceCodePage;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditorSourceCodePage;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.SchemaWrapper;
import org.apache.log4j.Logger;
@@ -76,9 +76,9 @@
try
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- FormEditor editor = ( FormEditor ) page.openEditor( new SchemaFormEditorInput( schemaWrapper
- .getMySchema() ), SchemaFormEditor.ID );
- editor.setActivePage( SchemaFormEditorSourceCodePage.ID );
+ FormEditor editor = ( FormEditor ) page.openEditor( new SchemaEditorInput( schemaWrapper
+ .getMySchema() ), SchemaEditor.ID );
+ editor.setActivePage( SchemaEditorSourceCodePage.ID );
}
catch ( PartInitException e )
{
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenTypeHierarchyAction.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenTypeHierarchyAction.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenTypeHierarchyAction.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenTypeHierarchyAction.java Thu Mar 22 08:01:34 2007
@@ -24,8 +24,8 @@
import org.apache.directory.ldapstudio.schemas.PluginConstants;
import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView;
import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView;
@@ -82,11 +82,11 @@
{
openTypeHierarchyFromTreeViewer( ( ( HierarchyView ) part ).getViewer() );
}
- else if ( part instanceof AttributeTypeFormEditor )
+ else if ( part instanceof AttributeTypeEditor )
{
openTypeHierarchy( SchemaPool.getInstance().getAttributeType( part.getTitle() ) );
}
- else if ( part instanceof ObjectClassFormEditor )
+ else if ( part instanceof ObjectClassEditor )
{
openTypeHierarchy( SchemaPool.getInstance().getObjectClass( part.getTitle() ) );
}
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java Thu Mar 22 08:01:34 2007
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import org.apache.directory.ldapstudio.schemas.controller.SchemasViewController;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
import org.apache.directory.server.core.tools.schema.AttributeTypeLiteral;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.log4j.Logger;
@@ -45,7 +45,7 @@
private AttributeTypeLiteral literal;
private Schema originatingSchema;
private ArrayList<SchemaElementListener> listeners;
- private AttributeTypeFormEditor editor;
+ private AttributeTypeEditor editor;
/**
@@ -83,7 +83,7 @@
* Returns the editor associated to this attributeType
* @return the editor
*/
- public AttributeTypeFormEditor getEditor()
+ public AttributeTypeEditor getEditor()
{
return editor;
}
@@ -93,7 +93,7 @@
* Sets the editor associated to this attributeType
* @param editor the associated editor
*/
- public void setEditor( AttributeTypeFormEditor editor )
+ public void setEditor( AttributeTypeEditor editor )
{
this.editor = editor;
}
@@ -103,7 +103,7 @@
* Call this method to remove the attributeType<->Editor association
* @param editor the associated editor
*/
- public void removeEditor( AttributeTypeFormEditor editor )
+ public void removeEditor( AttributeTypeEditor editor )
{
if ( this.editor == editor )
this.editor = null;
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/ObjectClass.java?view=diff&rev=521301&r1=521300&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/ObjectClass.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/ObjectClass.java Thu Mar 22 08:01:34 2007
@@ -23,7 +23,7 @@
import java.util.ArrayList;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
import org.apache.directory.server.core.tools.schema.ObjectClassLiteral;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.log4j.Logger;
@@ -41,7 +41,7 @@
private ObjectClassLiteral literal;
private Schema originatingSchema;
private ArrayList<SchemaElementListener> listeners;
- private ObjectClassFormEditor editor;
+ private ObjectClassEditor editor;
/**
@@ -79,7 +79,7 @@
* Returns the editor associated to this objectClass
* @return the editor
*/
- public ObjectClassFormEditor getEditor()
+ public ObjectClassEditor getEditor()
{
return editor;
}
@@ -89,7 +89,7 @@
* Sets the editor associated to this objectClass
* @param editor the associated editor
*/
- public void setEditor( ObjectClassFormEditor editor )
+ public void setEditor( ObjectClassEditor editor )
{
this.editor = editor;
}
@@ -99,7 +99,7 @@
* Call this method to remove the objectClass<->Editor association
* @param editor the associated editor
*/
- public void removeEditor( ObjectClassFormEditor editor )
+ public void removeEditor( ObjectClassEditor editor )
{
if ( this.editor == editor )
this.editor = null;
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditor.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditor.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditor.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditor.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditor.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditor.java Thu Mar 22 08:01:34 2007
@@ -39,22 +39,22 @@
/**
* This class is the Attribute Type Editor main class
*/
-public class AttributeTypeFormEditor extends FormEditor
+public class AttributeTypeEditor extends FormEditor
{
/** The logger */
- private static Logger logger = Logger.getLogger( AttributeTypeFormEditor.class );
+ private static Logger logger = Logger.getLogger( AttributeTypeEditor.class );
/** The ID of the Editor */
public static final String ID = Activator.PLUGIN_ID + ".view.attributeTypeEditor"; //$NON-NLS-1$
/** The Overview page */
- private AttributeTypeFormEditorOverviewPage overview;
+ private AttributeTypeEditorOverviewPage overview;
/** The Source Code page */
- private AttributeTypeFormEditorSourceCodePage sourceCode;
+ private AttributeTypeEditorSourceCodePage sourceCode;
/** The Used By page */
- private AttributeTypeFormEditorUsedByPage usedBy;
+ private AttributeTypeEditorUsedByPage usedBy;
/** The dirty state flag */
private boolean dirty = false;
@@ -72,7 +72,7 @@
{
Object selectedPage = event.getSelectedPage();
- if ( selectedPage instanceof AttributeTypeFormEditorOverviewPage )
+ if ( selectedPage instanceof AttributeTypeEditorOverviewPage )
{
if ( !sourceCode.canLeaveThePage() )
{
@@ -82,7 +82,7 @@
overview.refreshUI();
}
- else if ( selectedPage instanceof AttributeTypeFormEditorSourceCodePage )
+ else if ( selectedPage instanceof AttributeTypeEditorSourceCodePage )
{
if ( sourceCode.canLeaveThePage() )
{
@@ -96,7 +96,7 @@
/**
* Default constructor
*/
- public AttributeTypeFormEditor()
+ public AttributeTypeEditor()
{
super();
}
@@ -115,7 +115,7 @@
setInput( input );
setPartName( input.getName() );
- originalAttributeType = ( ( AttributeTypeFormEditorInput ) getEditorInput() ).getAttributeType();
+ originalAttributeType = ( ( AttributeTypeEditorInput ) getEditorInput() ).getAttributeType();
originalAttributeType.setEditor( this );
try
@@ -153,11 +153,11 @@
{
try
{
- overview = new AttributeTypeFormEditorOverviewPage( this );
+ overview = new AttributeTypeEditorOverviewPage( this );
addPage( overview );
- sourceCode = new AttributeTypeFormEditorSourceCodePage( this );
+ sourceCode = new AttributeTypeEditorSourceCodePage( this );
addPage( sourceCode );
- usedBy = new AttributeTypeFormEditorUsedByPage( this );
+ usedBy = new AttributeTypeEditorUsedByPage( this );
addPage( usedBy );
}
catch ( PartInitException e )
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorInput.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorInput.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorInput.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorInput.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorInput.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorInput.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorInput.java Thu Mar 22 08:01:34 2007
@@ -31,7 +31,7 @@
/**
* This class is the Input class for the Attribute Type Editor
*/
-public class AttributeTypeFormEditorInput implements IEditorInput
+public class AttributeTypeEditorInput implements IEditorInput
{
private AttributeType attributeType = null;
@@ -42,7 +42,7 @@
* @param at
* the input attribute type
*/
- public AttributeTypeFormEditorInput( AttributeType at )
+ public AttributeTypeEditorInput( AttributeType at )
{
super();
this.attributeType = at;
@@ -129,9 +129,9 @@
{
if ( this == obj )
return true;
- if ( !( obj instanceof AttributeTypeFormEditorInput ) )
+ if ( !( obj instanceof AttributeTypeEditorInput ) )
return false;
- AttributeTypeFormEditorInput other = ( AttributeTypeFormEditorInput ) obj;
+ AttributeTypeEditorInput other = ( AttributeTypeEditorInput ) obj;
return other.getAttributeType().getOid().equals( this.attributeType.getOid() );
}
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorOverviewPage.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorOverviewPage.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorOverviewPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java Thu Mar 22 08:01:34 2007
@@ -37,8 +37,8 @@
import org.apache.directory.ldapstudio.schemas.view.ViewUtils;
import org.apache.directory.ldapstudio.schemas.view.editors.ManageAliasesDialog;
import org.apache.directory.ldapstudio.schemas.view.editors.Messages;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditorInput;
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.log4j.Logger;
@@ -74,10 +74,10 @@
/**
* This class is the Overview Page of the Attribute Type Editor
*/
-public class AttributeTypeFormEditorOverviewPage extends FormPage
+public class AttributeTypeEditorOverviewPage extends FormPage
{
/** The page ID*/
- public static final String ID = AttributeTypeFormEditor.ID + "overviewPage";
+ public static final String ID = AttributeTypeEditor.ID + "overviewPage";
/** The page title */
public static String TITLE = Messages.getString( "AttributeTypeFormEditor.Overview" );
@@ -187,15 +187,15 @@
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- SchemaFormEditorInput input = new SchemaFormEditorInput( modifiedAttributeType.getOriginatingSchema() );
- String editorId = SchemaFormEditor.ID;
+ SchemaEditorInput input = new SchemaEditorInput( modifiedAttributeType.getOriginatingSchema() );
+ String editorId = SchemaEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( AttributeTypeFormEditorInput.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( AttributeTypeEditorInput.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
};
@@ -222,16 +222,16 @@
SchemaPool pool = SchemaPool.getInstance();
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- AttributeTypeFormEditorInput input = new AttributeTypeFormEditorInput( pool.getAttributeType( supCombo
+ AttributeTypeEditorInput input = new AttributeTypeEditorInput( pool.getAttributeType( supCombo
.getItem( supCombo.getSelectionIndex() ) ) );
- String editorId = AttributeTypeFormEditor.ID;
+ String editorId = AttributeTypeEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( AttributeTypeFormEditorInput.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( AttributeTypeEditorInput.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
}
@@ -412,7 +412,7 @@
* @param editor
* the associated editor
*/
- public AttributeTypeFormEditorOverviewPage( FormEditor editor )
+ public AttributeTypeEditorOverviewPage( FormEditor editor )
{
super( editor, ID, TITLE );
}
@@ -424,8 +424,8 @@
protected void createFormContent( IManagedForm managedForm )
{
// Getting the original and modified attribute types
- modifiedAttributeType = ( ( AttributeTypeFormEditor ) getEditor() ).getModifiedAttributeType();
- originalAttributeType = ( ( AttributeTypeFormEditor ) getEditor() ).getOriginalAttributeType();
+ modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
+ originalAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getOriginalAttributeType();
// Creating the base UI
ScrolledForm form = managedForm.getForm();
@@ -1015,7 +1015,7 @@
*/
private void setEditorDirty()
{
- ( ( AttributeTypeFormEditor ) getEditor() ).setDirty( true );
+ ( ( AttributeTypeEditor ) getEditor() ).setDirty( true );
}
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorSourceCodePage.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorSourceCodePage.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorSourceCodePage.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorSourceCodePage.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorSourceCodePage.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorSourceCodePage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorSourceCodePage.java Thu Mar 22 08:01:34 2007
@@ -50,10 +50,10 @@
/**
* This class is the Source Code Page of the Attribute Type Editor
*/
-public class AttributeTypeFormEditorSourceCodePage extends FormPage
+public class AttributeTypeEditorSourceCodePage extends FormPage
{
/** The page ID*/
- public static final String ID = AttributeTypeFormEditor.ID + "sourceCodePage";
+ public static final String ID = AttributeTypeEditor.ID + "sourceCodePage";
/** The page title */
public static String TITLE = Messages.getString( "AttributeTypeFormEditor.Source_Code" );
@@ -75,7 +75,7 @@
canLeaveThePage = true;
try
{
- ( ( AttributeTypeFormEditor ) getEditor() ).setDirty( true );
+ ( ( AttributeTypeEditor ) getEditor() ).setDirty( true );
OpenLdapSchemaParser parser = new OpenLdapSchemaParser();
parser.parse( schemaSourceViewer.getTextWidget().getText() );
List attributeTypes = parser.getAttributeTypes();
@@ -107,7 +107,7 @@
* @param editor
* the associated editor
*/
- public AttributeTypeFormEditorSourceCodePage( FormEditor editor )
+ public AttributeTypeEditorSourceCodePage( FormEditor editor )
{
super( editor, ID, TITLE );
}
@@ -126,7 +126,7 @@
form.getBody().setLayout( layout );
toolkit.paintBordersFor( form.getBody() );
- modifiedAttributeType = ( ( AttributeTypeFormEditor ) getEditor() ).getModifiedAttributeType();
+ modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
// SOURCE CODE Field
schemaSourceViewer = new SchemaSourceViewer( form.getBody(), null, null, false, SWT.BORDER | SWT.H_SCROLL
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorUsedByPage.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorUsedByPage.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorUsedByPage.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorUsedByPage.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorUsedByPage.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeFormEditorUsedByPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorUsedByPage.java Thu Mar 22 08:01:34 2007
@@ -30,8 +30,8 @@
import org.apache.directory.ldapstudio.schemas.model.AttributeType;
import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassFormEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.objectClass.ObjectClassEditorInput;
import org.apache.log4j.Logger;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
@@ -56,10 +56,10 @@
/**
* This class is the Used By Page of the Attribute Type Editor
*/
-public class AttributeTypeFormEditorUsedByPage extends FormPage
+public class AttributeTypeEditorUsedByPage extends FormPage
{
/** The page ID */
- public static final String ID = AttributeTypeFormEditor.ID + "usedByPage";
+ public static final String ID = AttributeTypeEditor.ID + "usedByPage";
/** The page title */
public static String TITLE = "Used By";
@@ -82,16 +82,16 @@
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- ObjectClassFormEditorInput input = new ObjectClassFormEditorInput( schemaPool
+ ObjectClassEditorInput input = new ObjectClassEditorInput( schemaPool
.getObjectClass( mandatoryAttributeTable.getSelection()[0].getText() ) );
- String editorId = ObjectClassFormEditor.ID;
+ String editorId = ObjectClassEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( AttributeTypeFormEditorUsedByPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( AttributeTypeEditorUsedByPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
};
@@ -103,16 +103,16 @@
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- ObjectClassFormEditorInput input = new ObjectClassFormEditorInput( schemaPool
+ ObjectClassEditorInput input = new ObjectClassEditorInput( schemaPool
.getObjectClass( optionalAttibuteTable.getSelection()[0].getText() ) );
- String editorId = ObjectClassFormEditor.ID;
+ String editorId = ObjectClassEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( AttributeTypeFormEditorUsedByPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( AttributeTypeEditorUsedByPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
};
@@ -124,7 +124,7 @@
* @param editor
* the associated editor
*/
- public AttributeTypeFormEditorUsedByPage( FormEditor editor )
+ public AttributeTypeEditorUsedByPage( FormEditor editor )
{
super( editor, ID, TITLE );
schemaPool = SchemaPool.getInstance();
@@ -137,7 +137,7 @@
protected void createFormContent( IManagedForm managedForm )
{
// Getting the modified attribute type and listening to its modifications
- modifiedAttributeType = ( ( AttributeTypeFormEditor ) getEditor() ).getModifiedAttributeType();
+ modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
// Creating the base UI
ScrolledForm form = managedForm.getForm();
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditor.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditor.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditor.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditor.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditor.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditor.java Thu Mar 22 08:01:34 2007
@@ -39,19 +39,19 @@
/**
* This class is the ObjectClass Editor main class
*/
-public class ObjectClassFormEditor extends FormEditor
+public class ObjectClassEditor extends FormEditor
{
/** The logger */
- private static Logger logger = Logger.getLogger( ObjectClassFormEditor.class );
+ private static Logger logger = Logger.getLogger( ObjectClassEditor.class );
/** The ID of the Editor */
public static final String ID = Activator.PLUGIN_ID + ".view.objectClassEditor"; //$NON-NLS-1$
/** The Overview page */
- private ObjectClassFormEditorOverviewPage overview;
+ private ObjectClassEditorOverviewPage overview;
/** The Source Code page */
- private ObjectClassFormEditorSourceCodePage sourceCode;
+ private ObjectClassEditorSourceCodePage sourceCode;
/** The dirty state flag */
private boolean dirty = false;
@@ -69,7 +69,7 @@
{
Object selectedPage = event.getSelectedPage();
- if ( selectedPage instanceof ObjectClassFormEditorOverviewPage )
+ if ( selectedPage instanceof ObjectClassEditorOverviewPage )
{
if ( !sourceCode.canLeaveThePage() )
{
@@ -79,7 +79,7 @@
overview.refreshUI();
}
- else if ( selectedPage instanceof ObjectClassFormEditorSourceCodePage )
+ else if ( selectedPage instanceof ObjectClassEditorSourceCodePage )
{
if ( sourceCode.canLeaveThePage() )
{
@@ -93,7 +93,7 @@
/**
* Default constructor
*/
- public ObjectClassFormEditor()
+ public ObjectClassEditor()
{
super();
}
@@ -109,7 +109,7 @@
setInput( input );
setPartName( input.getName() );
- originalObjectClass = ( ( ObjectClassFormEditorInput ) getEditorInput() ).getObjectClass();
+ originalObjectClass = ( ( ObjectClassEditorInput ) getEditorInput() ).getObjectClass();
originalObjectClass.setEditor( this );
try
@@ -143,9 +143,9 @@
{
try
{
- overview = new ObjectClassFormEditorOverviewPage( this ); //$NON-NLS-1$ //$NON-NLS-2$
+ overview = new ObjectClassEditorOverviewPage( this ); //$NON-NLS-1$ //$NON-NLS-2$
addPage( overview );
- sourceCode = new ObjectClassFormEditorSourceCodePage( this ); //$NON-NLS-1$ //$NON-NLS-2$
+ sourceCode = new ObjectClassEditorSourceCodePage( this ); //$NON-NLS-1$ //$NON-NLS-2$
addPage( sourceCode );
}
catch ( PartInitException e )
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorInput.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorInput.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorInput.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorInput.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorInput.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorInput.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorInput.java Thu Mar 22 08:01:34 2007
@@ -31,7 +31,7 @@
/**
* This class is the Input class for the Object Class Editor
*/
-public class ObjectClassFormEditorInput implements IEditorInput
+public class ObjectClassEditorInput implements IEditorInput
{
private ObjectClass objectClass = null;
@@ -42,7 +42,7 @@
* @param obj
* the object class
*/
- public ObjectClassFormEditorInput( ObjectClass obj )
+ public ObjectClassEditorInput( ObjectClass obj )
{
super();
this.objectClass = obj;
@@ -112,9 +112,9 @@
{
if ( this == obj )
return true;
- if ( !( obj instanceof ObjectClassFormEditorInput ) )
+ if ( !( obj instanceof ObjectClassEditorInput ) )
return false;
- ObjectClassFormEditorInput other = ( ObjectClassFormEditorInput ) obj;
+ ObjectClassEditorInput other = ( ObjectClassEditorInput ) obj;
return other.getObjectClass().getOid().equals( this.objectClass.getOid() );
}
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorOverviewPage.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorOverviewPage.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorOverviewPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java Thu Mar 22 08:01:34 2007
@@ -35,10 +35,10 @@
import org.apache.directory.ldapstudio.schemas.view.editors.ManageAliasesDialog;
import org.apache.directory.ldapstudio.schemas.view.editors.Messages;
import org.apache.directory.ldapstudio.schemas.view.editors.ObjectClassSelectionDialog;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeFormEditorInput;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditor;
-import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaFormEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditorInput;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditor;
+import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditorInput;
import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper;
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
@@ -84,10 +84,10 @@
/**
* This class is the Overview Page of the Object Class Editor
*/
-public class ObjectClassFormEditorOverviewPage extends FormPage
+public class ObjectClassEditorOverviewPage extends FormPage
{
/** The page ID */
- public static final String ID = ObjectClassFormEditor.ID + "overviewPage";
+ public static final String ID = ObjectClassEditor.ID + "overviewPage";
/** The page title*/
public static final String TITLE = Messages.getString( "ObjectClassFormEditor.Overview" );
@@ -197,15 +197,15 @@
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- SchemaFormEditorInput input = new SchemaFormEditorInput( modifiedObjectClass.getOriginatingSchema() );
- String editorId = SchemaFormEditor.ID;
+ SchemaEditorInput input = new SchemaEditorInput( modifiedObjectClass.getOriginatingSchema() );
+ String editorId = SchemaEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( AttributeTypeFormEditorInput.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( AttributeTypeEditorInput.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
};
@@ -261,16 +261,16 @@
SchemaPool pool = SchemaPool.getInstance();
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- AttributeTypeFormEditorInput input = new AttributeTypeFormEditorInput( pool
+ AttributeTypeEditorInput input = new AttributeTypeEditorInput( pool
.getAttributeType( mandatoryAttributesTable.getSelection()[0].getText() ) );
- String editorId = AttributeTypeFormEditor.ID;
+ String editorId = AttributeTypeEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( ObjectClassFormEditorOverviewPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( ObjectClassEditorOverviewPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
@@ -366,16 +366,16 @@
SchemaPool pool = SchemaPool.getInstance();
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- AttributeTypeFormEditorInput input = new AttributeTypeFormEditorInput( pool
+ AttributeTypeEditorInput input = new AttributeTypeEditorInput( pool
.getAttributeType( optionalAttributesTable.getSelection()[0].getText() ) );
- String editorId = AttributeTypeFormEditor.ID;
+ String editorId = AttributeTypeEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( ObjectClassFormEditorOverviewPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( ObjectClassEditorOverviewPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
@@ -478,16 +478,16 @@
SchemaPool pool = SchemaPool.getInstance();
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- ObjectClassFormEditorInput input = new ObjectClassFormEditorInput( pool.getObjectClass( ocw
+ ObjectClassEditorInput input = new ObjectClassEditorInput( pool.getObjectClass( ocw
.getMyObjectClass().getNames()[0] ) );
- String editorId = ObjectClassFormEditor.ID;
+ String editorId = ObjectClassEditor.ID;
try
{
page.openEditor( input, editorId );
}
catch ( PartInitException exception )
{
- Logger.getLogger( ObjectClassFormEditorOverviewPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+ Logger.getLogger( ObjectClassEditorOverviewPage.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
}
}
@@ -587,7 +587,7 @@
* @param editor
* the associated editor
*/
- public ObjectClassFormEditorOverviewPage( FormEditor editor )
+ public ObjectClassEditorOverviewPage( FormEditor editor )
{
super( editor, ID, TITLE );
}
@@ -599,8 +599,8 @@
protected void createFormContent( IManagedForm managedForm )
{
// Getting the original and modified object classes
- modifiedObjectClass = ( ( ObjectClassFormEditor ) getEditor() ).getModifiedObjectClass();
- originalObjectClass = ( ( ObjectClassFormEditor ) getEditor() ).getOriginalObjectClass();
+ modifiedObjectClass = ( ( ObjectClassEditor ) getEditor() ).getModifiedObjectClass();
+ originalObjectClass = ( ( ObjectClassEditor ) getEditor() ).getOriginalObjectClass();
// Creating the base UI
ScrolledForm form = managedForm.getForm();
@@ -692,8 +692,8 @@
gridData.minimumHeight = 45;
superiorsTable.setLayoutData( gridData );
superiorsTableViewer = new TableViewer( superiorsTable );
- superiorsTableViewer.setContentProvider( new ObjectClassFormEditorSuperiorsTableContentProvider() );
- superiorsTableViewer.setLabelProvider( new ObjectClassFormEditorSuperiorsTableLabelProvider() );
+ superiorsTableViewer.setContentProvider( new ObjectClassEditorSuperiorsTableContentProvider() );
+ superiorsTableViewer.setLabelProvider( new ObjectClassEditorSuperiorsTableLabelProvider() );
Composite superiorsButtonComposite = toolkit.createComposite( client_general_information );
superiorsButtonComposite.setLayout( new GridLayout() );
addButtonSuperiorsTable = toolkit.createButton( superiorsButtonComposite, Messages
@@ -1071,7 +1071,7 @@
*/
private void setEditorDirty()
{
- ( ( ObjectClassFormEditor ) getEditor() ).setDirty( true );
+ ( ( ObjectClassEditor ) getEditor() ).setDirty( true );
}
Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSourceCodePage.java (from r521300, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSourceCodePage.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSourceCodePage.java?view=diff&rev=521301&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSourceCodePage.java&r1=521300&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSourceCodePage.java&r2=521301
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassFormEditorSourceCodePage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorSourceCodePage.java Thu Mar 22 08:01:34 2007
@@ -50,10 +50,10 @@
/**
* This class is the Source Code Page of the Object Class Editor
*/
-public class ObjectClassFormEditorSourceCodePage extends FormPage
+public class ObjectClassEditorSourceCodePage extends FormPage
{
/** The page ID */
- public static final String ID = ObjectClassFormEditor.ID + "sourceCodePage";
+ public static final String ID = ObjectClassEditor.ID + "sourceCodePage";
/** The page title*/
public static final String TITLE = Messages.getString( "ObjectClassFormEditor.Source_Code" );
@@ -75,7 +75,7 @@
canLeaveThePage = true;
try
{
- ( ( ObjectClassFormEditor ) getEditor() ).setDirty( true );
+ ( ( ObjectClassEditor ) getEditor() ).setDirty( true );
OpenLdapSchemaParser parser = new OpenLdapSchemaParser();
parser.parse( schemaSourceViewer.getTextWidget().getText() );
@@ -107,7 +107,7 @@
* @param editor
* the associated editor
*/
- public ObjectClassFormEditorSourceCodePage( FormEditor editor )
+ public ObjectClassEditorSourceCodePage( FormEditor editor )
{
super( editor, ID, TITLE );
}
@@ -126,7 +126,7 @@
form.getBody().setLayout( layout );
toolkit.paintBordersFor( form.getBody() );
- modifiedObjectClass = ( ( ObjectClassFormEditor ) getEditor() ).getModifiedObjectClass();
+ modifiedObjectClass = ( ( ObjectClassEditor ) getEditor() ).getModifiedObjectClass();
// SOURCE CODE Field
schemaSourceViewer = new SchemaSourceViewer( form.getBody(), null, null, false, SWT.BORDER | SWT.H_SCROLL
|