directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r511018 [2/2] - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin: ./ META-INF/ src/main/java/org/apache/directory/ldapstudio/schemas/ src/main/java/org/apache/directory/ldapstudio/schemas/controller/ src/main/java/org/apache/directo...
Date Fri, 23 Feb 2007 17:01:42 GMT
Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/SchemaPool.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/SchemaPool.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/SchemaPool.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/SchemaPool.java Fri Feb 23 09:01:39 2007
@@ -29,7 +29,7 @@
 import java.util.Hashtable;
 import java.util.Set;
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.Platform;
@@ -73,7 +73,7 @@
     {
         try
         {
-            Preferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+            Preferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
             Preferences saved_workspace = prefs.node( SAVED_WORKSPACE );
 
             //we only store the references to schemas that have ALREADY
@@ -105,7 +105,7 @@
     {
         try
         {
-            Preferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+            Preferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
             Preferences saved_workspace = prefs.node( SAVED_WORKSPACE );
             String[] schemaNames = saved_workspace.childrenNames();
             for ( String name : schemaNames )
@@ -137,14 +137,14 @@
 
     private static void initializeWithBundled( SchemaPool pool )
     {
-        URL urlcore = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/core.schema" ); //$NON-NLS-1$
-        URL urljava = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/java.schema" ); //$NON-NLS-1$
-        URL urlnis = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/nis.schema" ); //$NON-NLS-1$
-        URL urlsystem = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/system.schema" ); //$NON-NLS-1$
-        URL urlautofs = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/autofs.schema" ); //$NON-NLS-1$
-        URL urlcorba = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/corba.schema" ); //$NON-NLS-1$
-        URL urlcosine = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/schemas/cosine.schema" ); //$NON-NLS-1$
-        URL urlinetorgperson = Platform.getBundle( Application.PLUGIN_ID ).getResource(
+        URL urlcore = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/core.schema" ); //$NON-NLS-1$
+        URL urljava = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/java.schema" ); //$NON-NLS-1$
+        URL urlnis = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/nis.schema" ); //$NON-NLS-1$
+        URL urlsystem = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/system.schema" ); //$NON-NLS-1$
+        URL urlautofs = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/autofs.schema" ); //$NON-NLS-1$
+        URL urlcorba = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/corba.schema" ); //$NON-NLS-1$
+        URL urlcosine = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/schemas/cosine.schema" ); //$NON-NLS-1$
+        URL urlinetorgperson = Platform.getBundle( Activator.PLUGIN_ID ).getResource(
             "ressources/schemas/inetorgperson.schema" ); //$NON-NLS-1$
 
         try
@@ -168,7 +168,7 @@
 
     private static void initializeWithSpecified( SchemaPool pool )
     {
-        IEclipsePreferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+        IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
         String specificPath = prefs
             .get( SchemaPreferencePage.SPECIFIC_CORE_DIRECTORY, System.getProperty( "user.home" ) ); //$NON-NLS-1$
 
@@ -224,7 +224,7 @@
                     //1) create the pool instance
                     SchemaPool pool = new SchemaPool();
 
-                    IEclipsePreferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+                    IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
 
                     //2) initialize the pool
                     boolean initialize_with_specified = prefs.getBoolean( SchemaPreferencePage.SPECIFIC_CORE, false );

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Syntaxes.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Syntaxes.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Syntaxes.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Syntaxes.java Fri Feb 23 09:01:39 2007
@@ -27,7 +27,7 @@
 import java.util.Iterator;
 
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.eclipse.core.runtime.Platform;
 
 
@@ -45,7 +45,7 @@
         try
         {
             syntaxes = new ArrayList<Syntax>();
-            URL url = Platform.getBundle( Application.PLUGIN_ID ).getResource( "ressources/utils/syntaxes.xml" ); //$NON-NLS-1$
+            URL url = Platform.getBundle( Activator.PLUGIN_ID ).getResource( "ressources/utils/syntaxes.xml" ); //$NON-NLS-1$
             XMLConfiguration config = new XMLConfiguration( url );
 
             // We get the number of syntaxes to parse

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.editors;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.AttributeType;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -45,7 +45,7 @@
     private static Logger logger = Logger.getLogger( AttributeTypeFormEditor.class );
 
     /** The ID of the Editor */
-    public static final String ID = Application.PLUGIN_ID + ".view.attributeTypeEditor"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.attributeTypeEditor"; //$NON-NLS-1$
 
     /** The Overview page */
     private AttributeTypeFormEditorOverviewPage overview;

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.editors;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
 import org.apache.directory.ldapstudio.schemas.view.IImageKeys;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -37,7 +37,7 @@
     {
         if ( columnIndex == 0 )
         {
-            return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE )
+            return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE )
                 .createImage();
         }
         return null;

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditor.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditor.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditor.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.editors;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -45,7 +45,7 @@
     private static Logger logger = Logger.getLogger( ObjectClassFormEditor.class );
 
     /** The ID of the Editor */
-    public static final String ID = Application.PLUGIN_ID + ".view.objectClassEditor"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.objectClassEditor"; //$NON-NLS-1$
 
     /** The Overview page */
     private ObjectClassFormEditorOverviewPage overview;

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java Fri Feb 23 09:01:39 2007
@@ -27,8 +27,8 @@
 import java.util.Comparator;
 import java.util.HashSet;
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
-import org.apache.directory.ldapstudio.schemas.controller.PoolManagerController;
+import org.apache.directory.ldapstudio.schemas.Activator;
+import org.apache.directory.ldapstudio.schemas.controller.SchemasViewController;
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
 import org.apache.directory.ldapstudio.schemas.model.Schema;
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
@@ -277,7 +277,7 @@
             }
             catch ( PartInitException exception )
             {
-                Logger.getLogger( PoolManagerController.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+                Logger.getLogger( SchemasViewController.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
             }
         }
 
@@ -382,7 +382,7 @@
             }
             catch ( PartInitException exception )
             {
-                Logger.getLogger( PoolManagerController.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+                Logger.getLogger( SchemasViewController.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
             }
         }
 
@@ -857,7 +857,7 @@
         {
             TableItem item = new TableItem( mandatoryAttributesTable, SWT.NONE, i );
             item.setImage( AbstractUIPlugin
-                .imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ).createImage() );
+                .imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ).createImage() );
             item.setText( mustArray[i] );
             if ( ( selectionIndex != -1 ) && ( mustArray[i].equals( selectAttribute ) ) )
             {
@@ -886,7 +886,7 @@
         {
             TableItem item = new TableItem( optionalAttributesTable, SWT.NONE, i );
             item.setImage( AbstractUIPlugin
-                .imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ).createImage() );
+                .imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ).createImage() );
             item.setText( mayArray[i] );
             if ( ( selectionIndex != -1 ) && ( mayArray[i].equals( selectAttribute ) ) )
             {

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/SchemaFormEditor.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/SchemaFormEditor.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/SchemaFormEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/SchemaFormEditor.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.editors;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
@@ -36,7 +36,7 @@
 public class SchemaFormEditor extends FormEditor
 {
     private static Logger logger = Logger.getLogger( SchemaFormEditor.class );
-    public static final String ID = Application.PLUGIN_ID + ".view.schemaformeditor"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.schemaformeditor"; //$NON-NLS-1$
     private SchemaFormEditorSourceCodePage sourceCode;
 
 

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/StandardPerspective.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/StandardPerspective.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/StandardPerspective.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java Fri Feb 23 09:01:39 2007
@@ -21,22 +21,22 @@
 package org.apache.directory.ldapstudio.schemas.view.perspectives;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
-import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchicalViewer;
-import org.apache.directory.ldapstudio.schemas.view.viewers.PoolManager;
-import org.apache.directory.ldapstudio.schemas.view.viewers.SearchViewer;
+import org.apache.directory.ldapstudio.schemas.Activator;
+import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
+import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView;
+import org.apache.directory.ldapstudio.schemas.view.viewers.SearchView;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
 
 /**
- * This is the standard perspective with hierarchical viewer on the top left, pool manager on bottom left,
- * editor in top right, search field on bottom right.
+ * This is the standard perspective with Hierarchy View on the top left, Schemas View on bottom left,
+ * editor in top right, Search View on bottom right.
  *
  */
-public class StandardPerspective implements IPerspectiveFactory
+public class Perspective implements IPerspectiveFactory
 {
-    public static final String ID = Application.PLUGIN_ID + ".perspective"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".perspective"; //$NON-NLS-1$
 
 
     public void createInitialLayout( IPageLayout layout )
@@ -44,21 +44,21 @@
         String editorArea = layout.getEditorArea();
         layout.setEditorAreaVisible( true );
 
-        layout.addStandaloneView( HierarchicalViewer.ID, true, IPageLayout.LEFT, 0.3f, editorArea );
-        layout.getViewLayout( HierarchicalViewer.ID ).setCloseable( false );
+        layout.addStandaloneView( HierarchyView.ID, true, IPageLayout.LEFT, 0.3f, editorArea );
+        layout.getViewLayout( HierarchyView.ID ).setCloseable( false );
 
-        layout.addStandaloneView( PoolManager.ID, true, IPageLayout.BOTTOM, 0.5f, HierarchicalViewer.ID );
-        layout.getViewLayout( PoolManager.ID ).setCloseable( false );
+        layout.addStandaloneView( SchemasView.ID, true, IPageLayout.BOTTOM, 0.5f, HierarchyView.ID );
+        layout.getViewLayout( SchemasView.ID ).setCloseable( false );
 
-        layout.addStandaloneView( SearchViewer.ID, true, IPageLayout.BOTTOM, 0.7f, editorArea );
-        layout.getViewLayout( SearchViewer.ID ).setCloseable( false );
+        layout.addStandaloneView( SearchView.ID, true, IPageLayout.BOTTOM, 0.7f, editorArea );
+        layout.getViewLayout( SearchView.ID ).setCloseable( false );
 
         layout.addPerspectiveShortcut( "org.apache.directory.ldapstudio.browser.ui.perspective.BrowserPerspective" ); //$NON-NLS-1$
-        layout.addPerspectiveShortcut( StandardPerspective.ID );
+        layout.addPerspectiveShortcut( Perspective.ID );
 
         // Adding View shortcuts
-        layout.addShowViewShortcut( HierarchicalViewer.ID );
-        layout.addShowViewShortcut( PoolManager.ID );
-        layout.addShowViewShortcut( SearchViewer.ID );
+        layout.addShowViewShortcut( HierarchyView.ID );
+        layout.addShowViewShortcut( SchemasView.ID );
+        layout.addShowViewShortcut( SearchView.ID );
     }
 }

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java Fri Feb 23 09:01:39 2007
@@ -23,7 +23,7 @@
 
 import java.io.IOException;
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -51,7 +51,7 @@
     public GeneralPreferencePage()
     {
         super( GRID );
-        preferences = new ScopedPreferenceStore( new ConfigurationScope(), Application.PLUGIN_ID );
+        preferences = new ScopedPreferenceStore( new ConfigurationScope(), Activator.PLUGIN_ID );
         setPreferenceStore( preferences );
     }
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java Fri Feb 23 09:01:39 2007
@@ -23,7 +23,7 @@
 
 import java.io.IOException;
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
@@ -52,7 +52,7 @@
     public SchemaPreferencePage()
     {
         super( GRID );
-        preferences = new ScopedPreferenceStore( new ConfigurationScope(), Application.PLUGIN_ID );
+        preferences = new ScopedPreferenceStore( new ConfigurationScope(), Activator.PLUGIN_ID );
         setPreferenceStore( preferences );
     }
 

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalViewer.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalViewer.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalViewer.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java Fri Feb 23 09:01:39 2007
@@ -21,8 +21,8 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
-import org.apache.directory.ldapstudio.schemas.controller.HierarchicalViewerController;
+import org.apache.directory.ldapstudio.schemas.Activator;
+import org.apache.directory.ldapstudio.schemas.controller.HierarchyViewController;
 import org.apache.directory.ldapstudio.schemas.model.LDAPModelEvent;
 import org.apache.directory.ldapstudio.schemas.model.PoolListener;
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
@@ -39,16 +39,16 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchicalViewer extends ViewPart implements PoolListener
+public class HierarchyView extends ViewPart implements PoolListener
 {
     /** The view's ID */
-    public static final String ID = Application.PLUGIN_ID + ".view.HierarchicalViewer"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.HierarchyView"; //$NON-NLS-1$
 
     /** The tree viewer */
     private TreeViewer viewer;
 
     /** The content provider */
-    private HierarchicalContentProvider contentProvider;
+    private HierarchyViewContentProvider contentProvider;
 
 
     /* (non-Javadoc)
@@ -66,7 +66,7 @@
         pool.addListener( this );
 
         // Adding the controller
-        new HierarchicalViewerController( this );
+        new HierarchyViewController( this );
     }
 
 
@@ -79,7 +79,7 @@
     private void initViewer( Composite parent )
     {
         viewer = new TreeViewer( parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
-        contentProvider = new HierarchicalContentProvider();
+        contentProvider = new HierarchyViewContentProvider();
         contentProvider.bindToTreeViewer( viewer );
     }
 

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalContentProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalContentProvider.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalContentProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java Fri Feb 23 09:01:39 2007
@@ -50,7 +50,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchicalContentProvider implements IStructuredContentProvider, ITreeContentProvider
+public class HierarchyViewContentProvider implements IStructuredContentProvider, ITreeContentProvider
 {
     /** The Schema Pool holding all schemas */
     private SchemaPool schemaPool;
@@ -69,12 +69,12 @@
 
 
     /**
-     * Creates a new instance of HierarchicalContentProvider.
+     * Creates a new instance of HierarchyViewContentProvider.
      *
      * @param schemaPool
      *      the associated Schema Pool
      */
-    public HierarchicalContentProvider()
+    public HierarchyViewContentProvider()
     {
         this.schemaPool = SchemaPool.getInstance();
 
@@ -417,7 +417,7 @@
     public void bindToTreeViewer( TreeViewer viewer )
     {
         viewer.setContentProvider( this );
-        viewer.setLabelProvider( new HierarchicalLabelProvider() );
+        viewer.setLabelProvider( new HierarchyViewLabelProvider() );
 
         IntermediateNode invisibleNode = new IntermediateNode( "**Primary Node**", null ); //$NON-NLS-1$
         viewer.setInput( invisibleNode );

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalLabelProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalLabelProvider.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchicalLabelProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java Fri Feb 23 09:01:39 2007
@@ -39,16 +39,16 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchicalLabelProvider extends LabelProvider
+public class HierarchyViewLabelProvider extends LabelProvider
 {
     /** The preferences store */
     private IPreferenceStore store;
 
 
     /**
-     * Creates a new instance of HierarchicalLabelProvider.
+     * Creates a new instance of HierarchyViewLabelProvider.
      */
-    public HierarchicalLabelProvider()
+    public HierarchyViewLabelProvider()
     {
         store = Activator.getDefault().getPreferenceStore();
     }

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasView.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManager.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasView.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManager.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasView.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManager.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasView.java Fri Feb 23 09:01:39 2007
@@ -21,8 +21,8 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
-import org.apache.directory.ldapstudio.schemas.controller.PoolManagerController;
+import org.apache.directory.ldapstudio.schemas.Activator;
+import org.apache.directory.ldapstudio.schemas.controller.SchemasViewController;
 import org.apache.directory.ldapstudio.schemas.model.LDAPModelEvent;
 import org.apache.directory.ldapstudio.schemas.model.PoolListener;
 import org.apache.directory.ldapstudio.schemas.model.Schema;
@@ -43,14 +43,14 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class PoolManager extends ViewPart implements PoolListener, ISaveablePart2
+public class SchemasView extends ViewPart implements PoolListener, ISaveablePart2
 {
-    public static final String ID = Application.PLUGIN_ID + ".view.PoolManager"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.SchemasView"; //$NON-NLS-1$
 
-    private static Logger logger = Logger.getLogger( PoolManager.class );
+    private static Logger logger = Logger.getLogger( SchemasView.class );
     private TreeViewer viewer;
     private Composite parent;
-    private PoolManagerContentProvider contentProvider;
+    private SchemasViewContentProvider contentProvider;
 
 
     /**
@@ -69,7 +69,7 @@
         pool.addListener( this );
 
         // Adding the controller
-        new PoolManagerController( this );
+        new SchemasViewController( this );
     }
 
 
@@ -79,7 +79,7 @@
     private void initViewer()
     {
         viewer = new TreeViewer( parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
-        contentProvider = new PoolManagerContentProvider();
+        contentProvider = new SchemasViewContentProvider();
         contentProvider.bindToTreeViewer( viewer );
     }
 

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewContentProvider.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManagerContentProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewContentProvider.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManagerContentProvider.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewContentProvider.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManagerContentProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewContentProvider.java Fri Feb 23 09:01:39 2007
@@ -48,7 +48,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class PoolManagerContentProvider implements IStructuredContentProvider, ITreeContentProvider
+public class SchemasViewContentProvider implements IStructuredContentProvider, ITreeContentProvider
 {
     /** The Schema Pool */
     private SchemaPool pool;
@@ -57,7 +57,7 @@
     /**
      * Default constructor
      */
-    public PoolManagerContentProvider()
+    public SchemasViewContentProvider()
     {
         pool = SchemaPool.getInstance();
     }
@@ -165,7 +165,7 @@
     public void bindToTreeViewer( TreeViewer viewer )
     {
         viewer.setContentProvider( this );
-        viewer.setLabelProvider( new PoolManagerLabelProvider() );
+        viewer.setLabelProvider( new SchemasViewLabelProvider() );
 
         IntermediateNode invisibleNode = new IntermediateNode( "**Primary Node**", null ); //$NON-NLS-1$
         viewer.setInput( invisibleNode );

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManagerLabelProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManagerLabelProvider.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/PoolManagerLabelProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java Fri Feb 23 09:01:39 2007
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class PoolManagerLabelProvider extends LabelProvider
+public class SchemasViewLabelProvider extends LabelProvider
 {
     /* (non-Javadoc)
      * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchView.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewer.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchView.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewer.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchView.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewer.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchView.java Fri Feb 23 09:01:39 2007
@@ -21,8 +21,8 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
-import org.apache.directory.ldapstudio.schemas.controller.PoolManagerController;
+import org.apache.directory.ldapstudio.schemas.Activator;
+import org.apache.directory.ldapstudio.schemas.controller.SchemasViewController;
 import org.apache.directory.ldapstudio.schemas.model.AttributeType;
 import org.apache.directory.ldapstudio.schemas.model.LDAPModelEvent;
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
@@ -60,10 +60,10 @@
 /**
  * This class represents the Search View.
  */
-public class SearchViewer extends ViewPart implements PoolListener
+public class SearchView extends ViewPart implements PoolListener
 {
     /** The view's ID */
-    public static final String ID = Application.PLUGIN_ID + ".view.SearchViewer"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.SearchView"; //$NON-NLS-1$
 
     /** The Schema Pool */
     private SchemaPool pool;
@@ -74,32 +74,32 @@
     private TableViewer tableViewer;
     private Text searchField;
     private Combo typeCombo;
-    private SearchContentProvider searchContentProvider;
+    private SearchViewContentProvider searchContentProvider;
 
     /** The Type column */
-    private final String TYPE_COLUMN = Messages.getString( "SearchViewer.Type_Column" ); //$NON-NLS-1$
+    private final String TYPE_COLUMN = Messages.getString( "SearchView.Type_Column" ); //$NON-NLS-1$
 
     /** The Name column*/
-    private final String NAME_COLUMN = Messages.getString( "SearchViewer.Name_Column" ); //$NON-NLS-1$
+    private final String NAME_COLUMN = Messages.getString( "SearchView.Name_Column" ); //$NON-NLS-1$
 
     /** The Schema column */
-    private final String SCHEMA_COLUMN = Messages.getString( "SearchViewer.Schema_Column" ); //$NON-NLS-1$
+    private final String SCHEMA_COLUMN = Messages.getString( "SearchView.Schema_Column" ); //$NON-NLS-1$
 
     /** The Columns names Array */
     private String[] columnNames = new String[]
         { TYPE_COLUMN, NAME_COLUMN, SCHEMA_COLUMN, };
 
     /** The Search All type */
-    public static final String SEARCH_ALL = Messages.getString( "SearchViewer.Search_All_metadata" ); //$NON-NLS-1$
+    public static final String SEARCH_ALL = Messages.getString( "SearchView.Search_All_metadata" ); //$NON-NLS-1$
 
     /** The Search Name type */
-    public static final String SEARCH_NAME = Messages.getString( "SearchViewer.Search_Name" ); //$NON-NLS-1$
+    public static final String SEARCH_NAME = Messages.getString( "SearchView.Search_Name" ); //$NON-NLS-1$
 
     /** The Search OID type */
-    public static final String SEARCH_OID = Messages.getString( "SearchViewer.Search_OID" ); //$NON-NLS-1$
+    public static final String SEARCH_OID = Messages.getString( "SearchView.Search_OID" ); //$NON-NLS-1$
 
     /** The Search Description type */
-    public static final String SEARCH_DESC = Messages.getString( "SearchViewer.Search_Description" ); //$NON-NLS-1$
+    public static final String SEARCH_DESC = Messages.getString( "SearchView.Search_Description" ); //$NON-NLS-1$
 
     /** The current Search type */
     public static String searchType = SEARCH_ALL;
@@ -180,9 +180,9 @@
         // Create the table 
         createTable( top );
         createTableViewer();
-        this.searchContentProvider = new SearchContentProvider();
+        this.searchContentProvider = new SearchViewContentProvider();
         tableViewer.setContentProvider( searchContentProvider );
-        tableViewer.setLabelProvider( new SearchLabelProvider() );
+        tableViewer.setLabelProvider( new SearchViewLabelProvider() );
     }
 
 
@@ -276,7 +276,7 @@
             }
             catch ( PartInitException exception )
             {
-                Logger.getLogger( PoolManagerController.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
+                Logger.getLogger( SchemasViewController.class ).debug( "error when opening the editor" ); //$NON-NLS-1$
             }
         }
     }

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewContentProvider.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchContentProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewContentProvider.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchContentProvider.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewContentProvider.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchContentProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewContentProvider.java Fri Feb 23 09:01:39 2007
@@ -42,7 +42,7 @@
  * Content provider for the search view
  *
  */
-public class SearchContentProvider implements IStructuredContentProvider, PoolListener
+public class SearchViewContentProvider implements IStructuredContentProvider, PoolListener
 {
     private SchemaPool schemaPool;
     private Hashtable<String, ObjectClass> objectClassTable;
@@ -52,7 +52,7 @@
     /**
      * Default constructor
      */
-    public SearchContentProvider()
+    public SearchViewContentProvider()
     {
         this.schemaPool = SchemaPool.getInstance();
         schemaPool.addListener( this );
@@ -74,8 +74,8 @@
             String searchText = ( String ) parent;
 
             //reset the view title
-            SearchViewer view = ( SearchViewer ) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-                .findView( SearchViewer.ID );
+            SearchView view = ( SearchView ) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+                .findView( SearchView.ID );
             view.setPartName( Messages.getString( "SearchContentProvider.Search" ) ); //$NON-NLS-1$
 
             if ( searchText.length() > 0 )
@@ -95,8 +95,8 @@
                 for ( SchemaElement element : allList )
                 {
 
-                    if ( SearchViewer.searchType.equals( SearchViewer.SEARCH_NAME )
-                        || SearchViewer.searchType.equals( SearchViewer.SEARCH_ALL ) )
+                    if ( SearchView.searchType.equals( SearchView.SEARCH_NAME )
+                        || SearchView.searchType.equals( SearchView.SEARCH_ALL ) )
                     {
                         String[] names = element.getNames();
                         for ( String name : names )
@@ -113,8 +113,8 @@
                         }
                     }
 
-                    if ( SearchViewer.searchType.equals( SearchViewer.SEARCH_OID )
-                        || SearchViewer.searchType.equals( SearchViewer.SEARCH_ALL ) )
+                    if ( SearchView.searchType.equals( SearchView.SEARCH_OID )
+                        || SearchView.searchType.equals( SearchView.SEARCH_ALL ) )
                     {
                         String oid = element.getOid();
                         Matcher m = pattern.matcher( oid );
@@ -128,8 +128,8 @@
                         }
                     }
 
-                    if ( SearchViewer.searchType.equals( SearchViewer.SEARCH_DESC )
-                        || SearchViewer.searchType.equals( SearchViewer.SEARCH_ALL ) )
+                    if ( SearchView.searchType.equals( SearchView.SEARCH_DESC )
+                        || SearchView.searchType.equals( SearchView.SEARCH_ALL ) )
                     {
                         String desc = element.getDescription();
                         if ( desc == null )

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java (from r510881, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchLabelProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java?view=diff&rev=511018&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchLabelProvider.java&r1=510881&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchLabelProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.AttributeType;
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
 import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
@@ -36,7 +36,7 @@
  * Label provider for the search view
  *
  */
-public class SearchLabelProvider extends LabelProvider implements ITableLabelProvider
+public class SearchViewLabelProvider extends LabelProvider implements ITableLabelProvider
 {
 
     /* (non-Javadoc)
@@ -48,13 +48,13 @@
         {
             if ( element instanceof ObjectClass )
             {
-                return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.OBJECT_CLASS )
+                return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS )
                     .createImage();
             }
 
             if ( element instanceof AttributeType )
             {
-                return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE )
+                return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE )
                     .createImage();
             }
         }

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers.wrappers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.AttributeType;
 import org.apache.directory.ldapstudio.schemas.view.IImageKeys;
 import org.eclipse.swt.graphics.Image;
@@ -87,7 +87,7 @@
      */
     public Image getDisplayImage()
     {
-        return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE )
+        return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE )
             .createImage();
     }
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers.wrappers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.view.IImageKeys;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ISharedImages;
@@ -119,10 +119,10 @@
                 String imageKey = ISharedImages.IMG_OBJ_FOLDER;
                 return PlatformUI.getWorkbench().getSharedImages().getImage( imageKey );
             case ATTRIBUTE_TYPE_FOLDER:
-                return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
+                return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
                     IImageKeys.FOLDER_ATTRIBUTE_TYPE ).createImage();
             case OBJECT_CLASS_FOLDER:
-                return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
+                return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
                     IImageKeys.FOLDER_OBJECT_CLASS ).createImage();
         }
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers.wrappers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
 import org.apache.directory.ldapstudio.schemas.view.IImageKeys;
 import org.eclipse.swt.graphics.Image;
@@ -128,10 +128,10 @@
         String imageKey = ISharedImages.IMG_OBJS_WARN_TSK;
 
         if ( state == State.resolved )
-            return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.OBJECT_CLASS )
+            return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS )
                 .createImage();
         else if ( state == State.unResolved )
-            return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.OBJECT_CLASS_WARNING )
+            return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS_WARNING )
                 .createImage();
 
         return PlatformUI.getWorkbench().getSharedImages().getImage( imageKey );

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java Fri Feb 23 09:01:39 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.view.viewers.wrappers;
 
 
-import org.apache.directory.ldapstudio.schemas.controller.Application;
+import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.model.Schema;
 import org.apache.directory.ldapstudio.schemas.view.IImageKeys;
 import org.eclipse.swt.graphics.Image;
@@ -103,12 +103,12 @@
     {
         if ( this.mySchema.type.equals( Schema.SchemaType.coreSchema ) )
         {
-            return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.SCHEMA_CORE )
+            return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SCHEMA_CORE )
                 .createImage();
         }
         else
         {
-            return AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID, IImageKeys.SCHEMA ).createImage();
+            return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SCHEMA ).createImage();
         }
     }
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java Fri Feb 23 09:01:39 2007
@@ -24,7 +24,6 @@
 import java.util.Hashtable;
 
 import org.apache.directory.ldapstudio.schemas.Activator;
-import org.apache.directory.ldapstudio.schemas.controller.Application;
 import org.apache.directory.ldapstudio.schemas.model.AttributeType;
 import org.apache.directory.ldapstudio.schemas.model.OID;
 import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
@@ -131,7 +130,7 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                IEclipsePreferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+                IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
 
                 prefs.putBoolean( GeneralPreferencePage.AUTO_OID, autoOID.getSelection() );
                 if ( autoOID.getSelection() )
@@ -146,7 +145,7 @@
             }
         } );
 
-        IEclipsePreferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+        IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
 
         boolean auto_oid = prefs.getBoolean( GeneralPreferencePage.AUTO_OID, true );
         autoOID.setSelection( auto_oid );

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java Fri Feb 23 09:01:39 2007
@@ -24,7 +24,6 @@
 import java.util.Hashtable;
 
 import org.apache.directory.ldapstudio.schemas.Activator;
-import org.apache.directory.ldapstudio.schemas.controller.Application;
 import org.apache.directory.ldapstudio.schemas.model.OID;
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
 import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
@@ -132,7 +131,7 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                IEclipsePreferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+                IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
 
                 prefs.putBoolean( GeneralPreferencePage.AUTO_OID, autoOID.getSelection() );
                 if ( autoOID.getSelection() )
@@ -147,7 +146,7 @@
             }
         } );
 
-        IEclipsePreferences prefs = new ConfigurationScope().getNode( Application.PLUGIN_ID );
+        IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
 
         boolean auto_oid = prefs.getBoolean( GeneralPreferencePage.AUTO_OID, true );
         autoOID.setSelection( auto_oid );

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/view/viewers/messages.properties
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/view/viewers/messages.properties?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/view/viewers/messages.properties (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/view/viewers/messages.properties Fri Feb 23 09:01:39 2007
@@ -20,17 +20,13 @@
 # This file stores the Strings used by the User Interface of the application
 #
 
-HierarchicalViewer.Sort_alphabetically=Sort alphabetically
-HierarchicalViewer.Sort_unalphabetically=Sort unalphabetically
-PoolManager.Sort_alphabetically=Sort alphabetically
-PoolManager.Sort_unalphabetically=Sort unalphabetically
 SearchContentProvider.Search=Search
-SearchViewer.Type_Column=Type
-SearchViewer.Name_Column=Name
-SearchViewer.Schema_Column=Schema
-SearchViewer.Search_Name=Name
+SearchView.Type_Column=Type
+SearchView.Name_Column=Name
+SearchView.Schema_Column=Schema
+SearchView.Search_Name=Name
 SearchContentProvider.Search_(=Search (
 SearchContentProvider.Results)=\ results)
-SearchViewer.Search_All_metadata=All metadata
-SearchViewer.Search_OID=OID
-SearchViewer.Search_Description=Description
+SearchView.Search_All_metadata=All metadata
+SearchView.Search_OID=OID
+SearchView.Search_Description=Description

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties?view=diff&rev=511018&r1=511017&r2=511018
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties Fri Feb 23 09:01:39 2007
@@ -49,10 +49,6 @@
 ldapstudio-schemas-plugin.commands.createanewobjectclass.description=Creates a new object class
 ldapstudio-schemas-plugin.commands.createanewattributetype.name=Create a new attribute type
 ldapstudio-schemas-plugin.commands.createanewattributetype.description=Creates a new attribute type
-ldapstudio-schemas-plugin.commands.sorthierarchicalviewer.name=Sort Hierarchical Viewer
-ldapstudio-schemas-plugin.commands.sorthierarchicalviewer.description=Sorts the Hierarchical Viewer
-ldapstudio-schemas-plugin.commands.sortpoolmanager.name=Sort Pool Manager
-ldapstudio-schemas-plugin.commands.sortpoolmanager.description=Sorts the Pool Manager
 ldapstudio-schemas-plugin.commands.category.name=LDAPStudio Category
 
 ldapstudio-schemas-plugin.editors.objectclassformeditor.name=Object Class Form Editor



Mime
View raw message