directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r512716 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin: ./ src/main/java/org/apache/directory/ldapstudio/schemas/ src/main/java/org/apache/directory/ldapstudio/schemas/controller/ src/main/java/org/apache/directory/ldapstudio/sc...
Date Wed, 28 Feb 2007 11:33:25 GMT
Author: pamarcelot
Date: Wed Feb 28 03:33:16 2007
New Revision: 512716

URL: http://svn.apache.org/viewvc?view=rev&rev=512716
Log:
Refactored Preferences.
Preferences are now displayed under the Schemas Editor "category".

Added:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/OidPreferencePage.java
      - copied, changed from r512669, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasEditorPreferencePage.java
      - copied, changed from r512669, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java
Removed:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java
Modified:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/Activator.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Schema.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/SchemaPool.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties

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=512716&r1=512715&r2=512716
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml Wed Feb 28 03:33:16 2007
@@ -177,18 +177,21 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage"
-            id="org.apache.directory.ldapstudio.schemas.preferences.general"
-            name="%ldapstudio-schemas-plugin.preferencepages.objectclassandattributetype.name"/>
+            category="org.apache.directory.ldapstudio.schemas.preferences.general"
+            class="org.apache.directory.ldapstudio.schemas.view.preferences.OidPreferencePage"
+            id="org.apache.directory.ldapstudio.schemas.preferences.oid"
+            name="%ldapstudio-schemas-plugin.preferencepages.oid.name"/>
       <page
-            class="org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage"
-            id="org.apache.directory.ldapstudio.schemas.preferences.schema"
-            name="%ldapstudio-schemas-plugin.preferencepages.schema.name"/>
+            class="org.apache.directory.ldapstudio.schemas.view.preferences.SchemasEditorPreferencePage"
+            id="org.apache.directory.ldapstudio.schemas.preferences.general"
+            name="%ldapstudio-schemas-plugin.preferencepages.general.name"/>
       <page
+            category="org.apache.directory.ldapstudio.schemas.preferences.general"
             class="org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage"
             id="org.apache.directory.ldapstudio.schemas.preferences.hierarchyView"
             name="Hierarchy View"/>
       <page
+            category="org.apache.directory.ldapstudio.schemas.preferences.general"
             class="org.apache.directory.ldapstudio.schemas.view.preferences.SchemasViewPreferencePage"
             id="org.apache.directory.ldapstudio.schemas.preferences.schemasView"
             name="Schemas View"/>

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/Activator.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/Activator.java?view=diff&rev=512716&r1=512715&r2=512716
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/Activator.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/Activator.java
Wed Feb 28 03:33:16 2007
@@ -22,7 +22,7 @@
 
 
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
-import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasEditorPreferencePage;
 import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaCodeScanner;
 import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaTextAttributeProvider;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
@@ -76,7 +76,7 @@
     {
         // save workspace configuration
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
-        boolean save_workspace = prefs.getBoolean( SchemaPreferencePage.SAVE_WORKSPACE, true
);
+        boolean save_workspace = prefs.getBoolean( SchemasEditorPreferencePage.SAVE_WORKSPACE,
true );
         if ( save_workspace )
             SchemaPool.getInstance().savePool();
         plugin = null;

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java?view=diff&rev=512716&r1=512715&r2=512716
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java
Wed Feb 28 03:33:16 2007
@@ -23,8 +23,8 @@
 
 import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.PluginConstants;
-import org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage;
-import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.OidPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasEditorPreferencePage;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -44,12 +44,12 @@
     public void initializeDefaultPreferences()
     {
         IEclipsePreferences defaults = new DefaultScope().getNode( Activator.PLUGIN_ID );
-        defaults.put( GeneralPreferencePage.COMPANY_OID, "1.2.3.4.5.6" ); //$NON-NLS-1$
-        defaults.putBoolean( GeneralPreferencePage.AUTO_OID, true );
-        defaults.put( SchemaPreferencePage.DEFAULT_DIRECTORY, System.getProperty( "user.home"
) ); //$NON-NLS-1$
-        defaults.putBoolean( SchemaPreferencePage.SAVE_WORKSPACE, true );
-        defaults.putBoolean( SchemaPreferencePage.SPECIFIC_CORE, false );
-        defaults.put( SchemaPreferencePage.SPECIFIC_CORE_DIRECTORY, System.getProperty( "user.home"
) ); //$NON-NLS-1$
+        defaults.put( OidPreferencePage.COMPANY_OID, "1.2.3.4.5.6" ); //$NON-NLS-1$
+        defaults.putBoolean( OidPreferencePage.AUTO_OID, true );
+        defaults.put( SchemasEditorPreferencePage.DEFAULT_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
+        defaults.putBoolean( SchemasEditorPreferencePage.SAVE_WORKSPACE, true );
+        defaults.putBoolean( SchemasEditorPreferencePage.SPECIFIC_CORE, false );
+        defaults.put( SchemasEditorPreferencePage.SPECIFIC_CORE_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
 
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java?view=diff&rev=512716&r1=512715&r2=512716
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java
Wed Feb 28 03:33:16 2007
@@ -26,7 +26,7 @@
 import org.apache.directory.ldapstudio.schemas.controller.ICommandIds;
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
 import org.apache.directory.ldapstudio.schemas.model.Schema.SchemaType;
-import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasEditorPreferencePage;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -68,7 +68,7 @@
         fd.setText( Messages.getString( "OpenLocalFileAction.Open_a_schema_file" ) ); //$NON-NLS-1$
 
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
-        String defaultPath = prefs.get( SchemaPreferencePage.DEFAULT_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
+        String defaultPath = prefs.get( SchemasEditorPreferencePage.DEFAULT_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
         fd.setFilterPath( defaultPath );
         String[] filterExt =
             { "*.schema", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Schema.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Schema.java?view=diff&rev=512716&r1=512715&r2=512716
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Schema.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/Schema.java
Wed Feb 28 03:33:16 2007
@@ -35,7 +35,7 @@
 import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.io.SchemaParser;
 import org.apache.directory.ldapstudio.schemas.io.SchemaWriter;
-import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasEditorPreferencePage;
 import org.apache.directory.server.core.tools.schema.AttributeTypeLiteral;
 import org.apache.directory.server.core.tools.schema.ObjectClassLiteral;
 import org.apache.log4j.Logger;
@@ -579,7 +579,7 @@
             FileDialog fd = new FileDialog( new Shell(), SWT.SAVE );
             fd.setText( Messages.getString( "Schema.Save_this_schema" ) + this.getName()
); //$NON-NLS-1$
             IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
-            String defaultPath = prefs.get( SchemaPreferencePage.DEFAULT_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
+            String defaultPath = prefs.get( SchemasEditorPreferencePage.DEFAULT_DIRECTORY,
System.getProperty( "user.home" ) ); //$NON-NLS-1$
             fd.setFilterPath( defaultPath );
             fd.setFileName( this.name + ".schema" ); //$NON-NLS-1$
             fd.setFilterExtensions( new String[]
@@ -625,7 +625,7 @@
         FileDialog fd = new FileDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.SAVE );
         fd.setText( Messages.getString( "Schema.Save_this_schema" ) + this.getName() ); //$NON-NLS-1$
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
-        String defaultPath = prefs.get( SchemaPreferencePage.DEFAULT_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
+        String defaultPath = prefs.get( SchemasEditorPreferencePage.DEFAULT_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
         fd.setFilterPath( defaultPath );
         fd.setFileName( this.name + ".schema" ); //$NON-NLS-1$
         fd.setFilterExtensions( new String[]

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=512716&r1=512715&r2=512716
==============================================================================
--- 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
Wed Feb 28 03:33:16 2007
@@ -30,7 +30,7 @@
 import java.util.Set;
 
 import org.apache.directory.ldapstudio.schemas.Activator;
-import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasEditorPreferencePage;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
@@ -170,7 +170,7 @@
     {
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
         String specificPath = prefs
-            .get( SchemaPreferencePage.SPECIFIC_CORE_DIRECTORY, System.getProperty( "user.home"
) ); //$NON-NLS-1$
+            .get( SchemasEditorPreferencePage.SPECIFIC_CORE_DIRECTORY, System.getProperty(
"user.home" ) ); //$NON-NLS-1$
 
         File dir = new File( specificPath );
         String sCurPath = dir.getAbsolutePath() + File.separator;
@@ -227,7 +227,7 @@
                     IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
 
                     //2) initialize the pool
-                    boolean initialize_with_specified = prefs.getBoolean( SchemaPreferencePage.SPECIFIC_CORE,
false );
+                    boolean initialize_with_specified = prefs.getBoolean( SchemasEditorPreferencePage.SPECIFIC_CORE,
false );
                     if ( initialize_with_specified )
                     {
                         //2a) with user-specified core schemas
@@ -244,7 +244,7 @@
 
                     //4) load the pool with all the schemas that the user did select the
last time
                     //LDAPStudio was launched
-                    boolean save_workspace = prefs.getBoolean( SchemaPreferencePage.SAVE_WORKSPACE,
true );
+                    boolean save_workspace = prefs.getBoolean( SchemasEditorPreferencePage.SAVE_WORKSPACE,
true );
                     if ( save_workspace )
                         instance_.loadPool();
                 }

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/OidPreferencePage.java
(from r512669, 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/OidPreferencePage.java?view=diff&rev=512716&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/GeneralPreferencePage.java&r1=512669&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/OidPreferencePage.java&r2=512716
==============================================================================
--- 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/OidPreferencePage.java
Wed Feb 28 03:33:16 2007
@@ -39,7 +39,7 @@
  * From there you can configure the company OID and auto-prefix settings.
  *
  */
-public class GeneralPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
+public class OidPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
 {
 
     public static final String COMPANY_OID = "prefs_company_oid"; //$NON-NLS-1$
@@ -48,9 +48,10 @@
     private ScopedPreferenceStore preferences;
 
 
-    public GeneralPreferencePage()
+    public OidPreferencePage()
     {
         super( GRID );
+        super.setDescription( "General settings for OID" );
         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/preferences/SchemasEditorPreferencePage.java
(from r512669, 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/SchemasEditorPreferencePage.java?view=diff&rev=512716&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaPreferencePage.java&r1=512669&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasEditorPreferencePage.java&r2=512716
==============================================================================
--- 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/SchemasEditorPreferencePage.java
Wed Feb 28 03:33:16 2007
@@ -38,7 +38,7 @@
  * From there you can access schema related preferences.
  *
  */
-public class SchemaPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
+public class SchemasEditorPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
 {
 
     public static final String DEFAULT_DIRECTORY = "prefs_default_directory"; //$NON-NLS-1$
@@ -49,9 +49,10 @@
     private ScopedPreferenceStore preferences;
 
 
-    public SchemaPreferencePage()
+    public SchemasEditorPreferencePage()
     {
         super( GRID );
+        super.setDescription( "General settings for the Schemas Editor" );
         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/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=512716&r1=512715&r2=512716
==============================================================================
--- 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
Wed Feb 28 03:33:16 2007
@@ -29,7 +29,7 @@
 import org.apache.directory.ldapstudio.schemas.model.OID;
 import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
-import org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.OidPreferencePage;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.viewers.ISelection;
@@ -132,10 +132,10 @@
             {
                 IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
 
-                prefs.putBoolean( GeneralPreferencePage.AUTO_OID, autoOID.getSelection()
);
+                prefs.putBoolean( OidPreferencePage.AUTO_OID, autoOID.getSelection() );
                 if ( autoOID.getSelection() )
                 {
-                    String temp = prefs.get( GeneralPreferencePage.COMPANY_OID, "1.2.3.4.5.6"
); //$NON-NLS-1$
+                    String temp = prefs.get( OidPreferencePage.COMPANY_OID, "1.2.3.4.5.6"
); //$NON-NLS-1$
                     oidField.setText( temp + "." ); //$NON-NLS-1$
                 }
                 else
@@ -147,7 +147,7 @@
 
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
 
-        boolean auto_oid = prefs.getBoolean( GeneralPreferencePage.AUTO_OID, true );
+        boolean auto_oid = prefs.getBoolean( OidPreferencePage.AUTO_OID, true );
         autoOID.setSelection( auto_oid );
 
         Label label = new Label( container, SWT.NULL );
@@ -155,7 +155,7 @@
         oidField = new Text( container, SWT.BORDER | SWT.SINGLE );
         if ( auto_oid )
         {
-            String temp = prefs.get( GeneralPreferencePage.COMPANY_OID, "1.2.3.4.5.6" );
//$NON-NLS-1$
+            String temp = prefs.get( OidPreferencePage.COMPANY_OID, "1.2.3.4.5.6" ); //$NON-NLS-1$
             oidField.setText( temp + "." ); //$NON-NLS-1$
         }
         oidField.setLayoutData( gd );

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=512716&r1=512715&r2=512716
==============================================================================
--- 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
Wed Feb 28 03:33:16 2007
@@ -29,7 +29,7 @@
 import org.apache.directory.ldapstudio.schemas.model.ObjectClass;
 import org.apache.directory.ldapstudio.schemas.model.SchemaElement;
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
-import org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.OidPreferencePage;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.viewers.ISelection;
@@ -133,10 +133,10 @@
             {
                 IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
 
-                prefs.putBoolean( GeneralPreferencePage.AUTO_OID, autoOID.getSelection()
);
+                prefs.putBoolean( OidPreferencePage.AUTO_OID, autoOID.getSelection() );
                 if ( autoOID.getSelection() )
                 {
-                    String temp = prefs.get( GeneralPreferencePage.COMPANY_OID, "1.2.3.4.5.6"
); //$NON-NLS-1$
+                    String temp = prefs.get( OidPreferencePage.COMPANY_OID, "1.2.3.4.5.6"
); //$NON-NLS-1$
                     oidField.setText( temp + "." ); //$NON-NLS-1$
                 }
                 else
@@ -148,7 +148,7 @@
 
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID
);
 
-        boolean auto_oid = prefs.getBoolean( GeneralPreferencePage.AUTO_OID, true );
+        boolean auto_oid = prefs.getBoolean( OidPreferencePage.AUTO_OID, true );
         autoOID.setSelection( auto_oid );
 
         Label label = new Label( container, SWT.NULL );
@@ -156,7 +156,7 @@
         oidField = new Text( container, SWT.BORDER | SWT.SINGLE );
         if ( auto_oid )
         {
-            String temp = prefs.get( GeneralPreferencePage.COMPANY_OID, "1.2.3.4.5.6" );
//$NON-NLS-1$
+            String temp = prefs.get( OidPreferencePage.COMPANY_OID, "1.2.3.4.5.6" ); //$NON-NLS-1$
             oidField.setText( temp + "." ); //$NON-NLS-1$
         }
         oidField.setLayoutData( gd );

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=512716&r1=512715&r2=512716
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/plugin.properties
Wed Feb 28 03:33:16 2007
@@ -60,8 +60,8 @@
 ldapstudio-schemas-plugin.wizards.createanewobjectclass.name=Create a new object class
 ldapstudio-schemas-plugin.wizards.createanewattributetype.name=Create a new attribute type
 
-ldapstudio-schemas-plugin.preferencepages.objectclassandattributetype.name=ObjectClass And
AttributeType
-ldapstudio-schemas-plugin.preferencepages.schema.name=Schema
+ldapstudio-schemas-plugin.preferencepages.general.name=Schemas Editor
+ldapstudio-schemas-plugin.preferencepages.oid.name=OID
 
 ldapstudio-schemas-plugin.actionsets.actionset.label=Schema Plugin ActionSet
 ldapstudio-schemas-plugin.actionsets.menu.schemas.label=Schemas



Mime
View raw message