directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r664342 [4/7] - in /directory/sandbox/seelmann/testingframework: ./ apacheds-configuration-help/src/main/docbook/ apacheds-configuration-help/src/main/resources/html/images/ apacheds-configuration-help/src/main/resources/html/images/getting...
Date Sat, 07 Jun 2008 14:17:30 GMT
Modified: directory/sandbox/seelmann/testingframework/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/pom.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/pom.xml Sat Jun  7 07:17:06 2008
@@ -84,7 +84,7 @@
     <schemaeditor.version>1.2.0.SNAPSHOT</schemaeditor.version>
     <schemaeditor.feature.version>1.2.0.SNAPSHOT</schemaeditor.feature.version>
     <schemaeditor.help.version>1.2.0.SNAPSHOT</schemaeditor.help.version>
-    <studio.dsml.parser.version>0.4.1.SNAPSHOT</studio.dsml.parser.version>
+    <studio.dsml.parser.version>0.4.2.SNAPSHOT</studio.dsml.parser.version>
     <updatesite.version>1.2.0.SNAPSHOT</updatesite.version>
     <valueeditors.version>1.2.0.SNAPSHOT</valueeditors.version>
     <test.integration.core.version>1.2.0.SNAPSHOT</test.integration.core.version>
@@ -191,7 +191,7 @@
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>compare</artifactId>
-        <version>3.3.1-r33x_20070906</version>
+        <version>3.3.2.r33x_20080128</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse</groupId>
@@ -293,7 +293,7 @@
       <dependency>
         <groupId>org.eclipse.core</groupId>
         <artifactId>resources</artifactId>
-        <version>3.3.0-v20070604</version>
+        <version>3.3.1.R33x_v20080205</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.ant</groupId>
@@ -316,7 +316,7 @@
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>rcp</artifactId>
-        <version>3.2.0-v20070612</version>
+        <version>3.2.1.r33x_r20080131</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.equinox</groupId>
@@ -341,66 +341,66 @@
       <dependency>
         <groupId>org.eclipse.equinox</groupId>
         <artifactId>launcher</artifactId>
-        <version>1.0.1.R33x_v20070828</version>
+        <version>1.0.1.R33x_v20080118</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>osgi</artifactId>
-        <version>3.3.1-R33x_v20070828</version>
+        <version>3.3.2.R33x_v20080105</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.swt.gtk.linux</groupId>
         <artifactId>x86</artifactId>
-        <version>3.3.2-v3347</version>
+        <version>3.3.2.v3349</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.swt.gtk.linux</groupId>
         <artifactId>x86_64</artifactId>
-        <version>3.3.2-v3347</version>
+        <version>3.3.2.v3349</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.swt.gtk.linux</groupId>
         <artifactId>ppc</artifactId>
-        <version>3.3.2-v3347</version>
+        <version>3.3.2.v3349</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.swt.win32.win32</groupId>
         <artifactId>x86</artifactId>
-        <version>3.3.2-v3347a</version>
+        <version>3.3.3.v3349</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.swt.carbon</groupId>
         <artifactId>macosx</artifactId>
-        <version>3.3.2-v3347a</version>
+        <version>3.3.3.v3349</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
         <artifactId>x86</artifactId>
-        <version>1.0.2.R331_v20071019</version>
+        <version>1.0.3.R33x_v20080118</version>
         <type>tar.gz</type>
       </dependency>
       <dependency>
         <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
         <artifactId>x86_64</artifactId>
-        <version>1.0.2.R331_v20071019</version>
+        <version>1.0.3.R33x_v20080118</version>
         <type>tar.gz</type>
       </dependency>
       <dependency>
         <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
         <artifactId>ppc</artifactId>
-        <version>1.0.2.R331_v20071019</version>
+        <version>1.0.3.R33x_v20080118</version>
         <type>tar.gz</type>
       </dependency>
       <dependency>
         <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
         <artifactId>x86</artifactId>
-        <version>1.0.2.R331_v20071019</version>
+        <version>1.0.3.R33x_v20080118</version>
         <type>tar.gz</type>
       </dependency>
       <dependency>
         <groupId>org.eclipse.equinox.launcher.carbon</groupId>
         <artifactId>macosx</artifactId>
-        <version>1.0.2.R331_v20071019</version>
+        <version>1.0.3.R33x_v20080118</version>
         <type>tar.gz</type>
       </dependency>
       <dependency>
@@ -426,7 +426,7 @@
       <dependency>
         <groupId>org.eclipse.equinox.http</groupId>
         <artifactId>registry</artifactId>
-        <version>1.0.0-v20070608</version>
+        <version>1.0.1.R33x_v20071231</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.equinox</groupId>
@@ -552,7 +552,7 @@
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>jface</artifactId>
-        <version>3.3.1-M20070910-0800b</version>
+        <version>3.3.2.M20080207-0800</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse</groupId>
@@ -571,7 +571,7 @@
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>ui</artifactId>
-        <version>3.3.1-M20070910-0800b</version>
+        <version>3.3.1.M20071128-0800</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.core</groupId>
@@ -648,7 +648,7 @@
       <dependency>
         <groupId>org.eclipse.equinox</groupId>
         <artifactId>preferences</artifactId>
-        <version>3.2.100-v20070522</version>
+        <version>3.2.101.R33x_v20080117</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.equinox</groupId>
@@ -674,7 +674,7 @@
       <dependency>
         <groupId>org.eclipse.ui</groupId>
         <artifactId>workbench</artifactId>
-        <version>3.3.1-M20070921-1200</version>
+        <version>3.3.2.M20080207-0800</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.core</groupId>
@@ -838,7 +838,7 @@
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>help</artifactId>
-        <version>3.3.1-v20070726_33x</version>
+        <version>3.3.2.v20071126_33x</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.core</groupId>
@@ -853,12 +853,12 @@
       <dependency>
         <groupId>org.eclipse.jface</groupId>
         <artifactId>databinding</artifactId>
-        <version>1.1.1-M20070910-0800b</version>
+        <version>1.1.1.M20080207-0800</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>swt</artifactId>
-        <version>3.3.2-v3347</version>
+        <version>3.3.2.v3349d</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.update</groupId>
@@ -1031,7 +1031,7 @@
       <dependency>
         <groupId>org.eclipse.ui</groupId>
         <artifactId>console</artifactId>
-        <version>3.2.1-v20070824_r331</version>
+        <version>3.2.2.v20071031_r332</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse</groupId>
@@ -1120,7 +1120,7 @@
       <dependency>
         <groupId>org.eclipse.jface</groupId>
         <artifactId>text</artifactId>
-        <version>3.3.1-r331_v20070629</version>
+        <version>3.3.2.r332_20071017-0800</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.core</groupId>
@@ -1162,7 +1162,7 @@
       <dependency>
         <groupId>org.eclipse.ui.workbench</groupId>
         <artifactId>texteditor</artifactId>
-        <version>3.3.1-r331_v20070806</version>
+        <version>3.3.2.r332_20080109-0800</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.core</groupId>
@@ -1361,7 +1361,7 @@
       <dependency>
         <groupId>org.eclipse.help</groupId>
         <artifactId>ui</artifactId>
-        <version>3.3.1-v20070726_33x</version>
+        <version>3.3.2.v20071126_33x</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.help</groupId>
@@ -1430,7 +1430,7 @@
       <dependency>
         <groupId>org.eclipse.help</groupId>
         <artifactId>webapp</artifactId>
-        <version>3.3.1-v20070823_33x</version>
+        <version>3.3.2.v20071102_33x</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.help</groupId>
@@ -1457,7 +1457,7 @@
       <dependency>
         <groupId>org.eclipse</groupId>
         <artifactId>sdk</artifactId>
-        <version>3.3.2.R33x_v20071022</version>
+        <version>3.3.3-r33x_r20080129</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse</groupId>
@@ -1478,6 +1478,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.ui</groupId>
+        <artifactId>carbon</artifactId>
+        <version>3.2.100-I20070605-0010</version>
+      </dependency>
 
       <!-- Apache Directory Studio -->
       <dependency>
@@ -1620,17 +1625,17 @@
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap</artifactId>
-        <version>0.9.9-SNAPSHOT</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-asn1</artifactId>
-        <version>0.9.9-SNAPSHOT</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-converter</artifactId>
-        <version>0.9.9-SNAPSHOT</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
 
       <!-- Other dependencies -->

Modified: directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/0_index.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/0_index.xml (original)
+++ directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/0_index.xml Sat Jun  7 07:17:06 2008
@@ -14,12 +14,14 @@
   <!ENTITY help SYSTEM "3.1.1_help.xml">
   <!ENTITY help_server SYSTEM "3.1.1.1_help_server.xml">
   <!ENTITY install_update SYSTEM "3.1.2_install_update.xml">
-  <!ENTITY text_editors SYSTEM "3.1.3_text_editors.xml">
-  <!ENTITY accessibility SYSTEM "3.1.3.1_accessibility.xml">
-  <!ENTITY annotations SYSTEM "3.1.3.2_annotations.xml">
-  <!ENTITY linked_mode SYSTEM "3.1.3.3_linked_mode.xml">
-  <!ENTITY quick_diff SYSTEM "3.1.3.4_quick_diff.xml">
-  <!ENTITY spelling SYSTEM "3.1.3.5_spelling.xml">
+  <!ENTITY automatic_updates SYSTEM "3.1.2.1_automatic_updates.xml">
+  <!ENTITY network_connections SYSTEM "3.1.3_network_connections.xml">
+  <!ENTITY text_editors SYSTEM "3.1.4_text_editors.xml">
+  <!ENTITY accessibility SYSTEM "3.1.4.1_accessibility.xml">
+  <!ENTITY annotations SYSTEM "3.1.4.2_annotations.xml">
+  <!ENTITY linked_mode SYSTEM "3.1.4.3_linked_mode.xml">
+  <!ENTITY quick_diff SYSTEM "3.1.4.4_quick_diff.xml">
+  <!ENTITY spelling SYSTEM "3.1.4.5_spelling.xml">
   <!ENTITY whats_new SYSTEM "4_whats_new.xml">
   <!ENTITY release_notes SYSTEM "5_release_notes.xml">
 

Modified: directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1.2_install_update.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1.2_install_update.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1.2_install_update.xml (original)
+++ directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1.2_install_update.xml Sat Jun  7 07:17:06 2008
@@ -115,4 +115,7 @@
 			</mediaobject>
 		</screenshot>
 	</para>
+
+	&automatic_updates;
+
 </section>
\ No newline at end of file

Modified: directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1_preferences.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1_preferences.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1_preferences.xml (original)
+++ directory/sandbox/seelmann/testingframework/rcp-help/src/main/docbook/3.1_preferences.xml Sat Jun  7 07:17:06 2008
@@ -49,6 +49,7 @@
 
 	&help;
 	&install_update;
+	&network_connections;
 	&text_editors;
 
 </section>
\ No newline at end of file

Modified: directory/sandbox/seelmann/testingframework/rcp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/META-INF/MANIFEST.MF?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/seelmann/testingframework/rcp/META-INF/MANIFEST.MF Sat Jun  7 07:17:06 2008
@@ -10,7 +10,10 @@
  org.eclipse.update.core,
  org.eclipse.update.ui,
  org.eclipse.ui,
- org.eclipse.ui.intro
+ org.eclipse.ui.intro,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.core.filesystem
 Eclipse-LazyStart: true
 Bundle-ClassPath: .,
  lib/nlog4j-1.2.25.jar

Modified: directory/sandbox/seelmann/testingframework/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/pom.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/rcp/pom.xml Sat Jun  7 07:17:06 2008
@@ -165,6 +165,26 @@
       <artifactId>ui</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>ide</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>resources</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>filesystem</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>app</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
 </project>

Modified: directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/Application.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/Application.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/Application.java (original)
+++ directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/Application.java Sat Jun  7 07:17:06 2008
@@ -23,9 +23,11 @@
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
-import org.eclipse.core.runtime.IPlatformRunnable;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 
 
@@ -35,33 +37,36 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class Application implements IPlatformRunnable
+public class Application implements IApplication
 {
-
+    /** The plugin ID */
     public static final String PLUGIN_ID = "org.apache.directory.studio.rcp"; //$NON-NLS-1$
+
+    /** The logger*/
     private static Logger logger = Logger.getLogger( Application.class );
 
 
     /* (non-Javadoc)
-     * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
+     * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
      */
-    public Object run( Object args ) throws Exception
+    public Object start( IApplicationContext context ) throws Exception
     {
-        //Set up a simple configuration that logs on the console.
+        // Set up a simple configuration that logs on the console.
         PropertyConfigurator.configure( Platform.getBundle( Application.PLUGIN_ID ).getResource( "log4j.conf" ) ); //$NON-NLS-1$
         logger.info( "Entering Apache Directory Studio." ); //$NON-NLS-1$
         Display display = PlatformUI.createDisplay();
-        
+
         try
         {
             int returnCode = PlatformUI.createAndRunWorkbench( display, new ApplicationWorkbenchAdvisor() );
-        
             if ( returnCode == PlatformUI.RETURN_RESTART )
             {
-                return IPlatformRunnable.EXIT_RESTART;
+                return IApplication.EXIT_RESTART;
+            }
+            else
+            {
+                return IApplication.EXIT_OK;
             }
-            
-            return IPlatformRunnable.EXIT_OK;
         }
         finally
         {
@@ -69,4 +74,28 @@
             logger.info( "Exiting Apache Directory Studio." ); //$NON-NLS-1$
         }
     }
+
+
+    /* (non-Javadoc)
+     * @see org.eclipse.equinox.app.IApplication#stop()
+     */
+    public void stop()
+    {
+        final IWorkbench workbench = PlatformUI.getWorkbench();
+        if ( workbench == null )
+        {
+            return;
+        }
+        final Display display = workbench.getDisplay();
+        display.syncExec( new Runnable()
+        {
+            public void run()
+            {
+                if ( !display.isDisposed() )
+                {
+                    workbench.close();
+                }
+            }
+        } );
+    }
 }

Modified: directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java (original)
+++ directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java Sat Jun  7 07:17:06 2008
@@ -26,6 +26,7 @@
 import org.apache.directory.studio.actions.ReportABugAction;
 import org.apache.directory.studio.actions.UpdateAction;
 import org.apache.directory.studio.view.ImageKeys;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.ICoolBarManager;
@@ -57,6 +58,7 @@
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor
 {
+    private static final String OS_MACOSX = "macosx";
     private OpenFileAction openFileAction;
     private IWorkbenchAction closeAction;
     private IWorkbenchAction closeAllAction;
@@ -266,11 +268,17 @@
      */
     protected void fillMenuBar( IMenuManager menuBar )
     {
+        // Getting the OS
+        String os = Platform.getOS();
+
+        // Creating menus
         MenuManager fileMenu = new MenuManager( "&File", IWorkbenchActionConstants.M_FILE ); //$NON-NLS-1$
         MenuManager editMenu = new MenuManager( "&Edit", IWorkbenchActionConstants.M_EDIT ); //$NON-NLS-1$
         MenuManager navigateMenu = new MenuManager( "&Navigate", IWorkbenchActionConstants.M_NAVIGATE ); //$NON-NLS-1$
         MenuManager windowMenu = new MenuManager( "&Window", IWorkbenchActionConstants.M_WINDOW ); //$NON-NLS-1$
         MenuManager helpMenu = new MenuManager( "&Help", IWorkbenchActionConstants.M_HELP ); //$NON-NLS-1$
+        MenuManager hiddenMenu = new MenuManager( "Hidden", IWorkbenchActionConstants.M_HELP ); //$NON-NLS-1$
+        hiddenMenu.setVisible( false );
 
         // Adding menus
         menuBar.add( fileMenu );
@@ -280,6 +288,7 @@
         menuBar.add( new GroupMarker( IWorkbenchActionConstants.MB_ADDITIONS ) );
         menuBar.add( windowMenu );
         menuBar.add( helpMenu );
+        menuBar.add( hiddenMenu );
 
         // Populating File Menu
         fileMenu.add( newAction );
@@ -346,14 +355,23 @@
         windowMenu.add( new Separator() );
         windowMenu.add( closePerspectiveAction );
         windowMenu.add( closeAllPerspectivesAction );
-        windowMenu.add( new Separator() );
-        windowMenu.add( preferencesAction );
+        if ( ApplicationActionBarAdvisor.OS_MACOSX.equalsIgnoreCase( os ) )
+        {
+            // We hide the preferences action, it will be added by the "Carbon" plugin
+            hiddenMenu.add( preferencesAction );
+        }
+        else
+        {
+            windowMenu.add( new Separator() );
+            windowMenu.add( preferencesAction );
+        }
 
         // Help
         helpMenu.add( introAction );
         helpMenu.add( new Separator() );
         helpMenu.add( helpAction );
         helpMenu.add( dynamicHelpAction );
+        helpMenu.add( new Separator() );
         helpMenu.add( reportABug );
         helpMenu.add( new Separator() );
         MenuManager softwareUpdates = new MenuManager( Messages
@@ -361,8 +379,16 @@
         softwareUpdates.add( updateAction );
         softwareUpdates.add( manageConfigurationAction );
         helpMenu.add( softwareUpdates );
-        helpMenu.add( new Separator() );
-        helpMenu.add( aboutAction );
+        if ( ApplicationActionBarAdvisor.OS_MACOSX.equalsIgnoreCase( os ) )
+        {
+            // We hide the about action, it will be added by the "Carbon" plugin
+            hiddenMenu.add( aboutAction );
+        }
+        else
+        {
+            helpMenu.add( new Separator() );
+            helpMenu.add( aboutAction );
+        }
     }
 
 
@@ -374,6 +400,8 @@
         // add main tool bar
         IToolBarManager toolbar = new ToolBarManager( SWT.FLAT | SWT.RIGHT );
         toolbar.add( newDropDownAction );
+        toolbar.add( saveAction );
+        toolbar.add( printAction );
         toolbar.add( preferencesAction );
         coolBar.add( new ToolBarContributionItem( toolbar, Application.PLUGIN_ID + ".toolbar" ) ); //$NON-NLS-1$
 
@@ -387,7 +415,5 @@
         navToolBar.add( backwardHistoryAction );
         navToolBar.add( forwardHistoryAction );
         coolBar.add( new ToolBarContributionItem( navToolBar, IWorkbenchActionConstants.TOOLBAR_NAVIGATE ) );
-
     }
-
 }

Modified: directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java (original)
+++ directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java Sat Jun  7 07:17:06 2008
@@ -53,10 +53,6 @@
  */
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
 {
-    // The initial perspective that will be shwown in the workbench
-    private static final String PERSPECTIVE_ID = Application.PLUGIN_ID + ".perspective"; //$NON-NLS-1$
-
-
     /**
      * Performs arbitrary initialization before the workbench starts running.<br />
      * <br />

Modified: directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/actions/OpenFileAction.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/actions/OpenFileAction.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/actions/OpenFileAction.java (original)
+++ directory/sandbox/seelmann/testingframework/rcp/src/main/java/org/apache/directory/studio/actions/OpenFileAction.java Sat Jun  7 07:17:06 2008
@@ -21,27 +21,24 @@
 package org.apache.directory.studio.actions;
 
 
-import java.io.File;
 import java.text.MessageFormat;
 
 import org.apache.directory.studio.Messages;
-import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
 
 
 /**
@@ -54,10 +51,6 @@
 public class OpenFileAction extends Action implements IWorkbenchWindowActionDelegate
 {
 
-    /** The workbench window */
-    private IWorkbenchWindow workbenchWindow;
-
-
     /**
      * Creates a new instance of OpenFileAction.
      */
@@ -81,27 +74,32 @@
         init( window );
     }
 
+    private IWorkbenchWindow window;
+    private String filterPath;
 
-    /**
-     * {@inheritDoc}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
      */
     public void dispose()
     {
-        workbenchWindow = null;
+        window = null;
+        filterPath = null;
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
      */
     public void init( IWorkbenchWindow window )
     {
-        workbenchWindow = window;
+        this.window = window;
+        filterPath = System.getProperty( "user.home" ); //$NON-NLS-1$
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
      */
     public void run( IAction action )
     {
@@ -109,81 +107,66 @@
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
      */
     public void selectionChanged( IAction action, ISelection selection )
     {
     }
 
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.action.Action#run()
      */
     public void run()
     {
-        // get path
-        FileDialog dialog = new FileDialog( workbenchWindow.getShell(), SWT.OPEN );
-        dialog.setText( Messages.getString( "OpenFileAction.Open_File" ) ); //$NON-NLS-1$
-        String path = dialog.open();
-        if ( path == null || path.length() == 0 )
-        {
-            // canceled
-            return;
-        }
-
-        // check file 
-        File file = new File( path );
-        if ( !file.exists() )
-        {
-            String msg = MessageFormat.format(
-                Messages.getString( "OpenFileAction.File_x_does_not_exist" ), new Object[] //$NON-NLS-1$
-                    { file.getName() } );
-            MessageDialog.openWarning( workbenchWindow.getShell(), Messages
-                .getString( "OpenFileAction.Warning_message" ), msg ); //$NON-NLS-1$
-            return;
-        }
-        if ( !file.canRead() )
-        {
-            String msg = MessageFormat.format(
-                Messages.getString( "OpenFileAction.File_x_is_not_readable" ), new Object[] //$NON-NLS-1$
-                    { file.getName() } );
-            MessageDialog.openWarning( workbenchWindow.getShell(), Messages
-                .getString( "OpenFileAction.Warning_message" ), msg ); //$NON-NLS-1$
-            return;
-        }
-
-        // get editor for this file
-        IWorkbench workbench = workbenchWindow.getWorkbench();
-        IEditorRegistry editorRegistry = workbench.getEditorRegistry();
-        IEditorDescriptor descriptor = editorRegistry.getDefaultEditor( file.getName() );
-
-        if ( descriptor == null )
-        {
-            String msg = MessageFormat.format(
-                Messages.getString( "OpenFileAction.No_appropriate_editor_found_for_x" ), new Object[] //$NON-NLS-1$
-                { file.getName() } );
-            MessageDialog.openWarning( workbenchWindow.getShell(), Messages
-                .getString( "OpenFileAction.Warning_message" ), msg ); //$NON-NLS-1$
-            return;
-        }
-
-        // create IEdiorInput
-        IPath location = new Path( file.getAbsolutePath() );
-        ImageDescriptor imageDescriptor = descriptor.getImageDescriptor();
-        IPathEditorInput input = new PathEditorInput( location, imageDescriptor );
-
-        // activate editor
-        IWorkbenchPage page = workbenchWindow.getActivePage();
-        String editorId = descriptor.getId();
-        try
-        {
-            page.openEditor( input, editorId );
-        }
-        catch ( PartInitException e )
-        {
-            e.printStackTrace();
+        FileDialog dialog = new FileDialog( window.getShell(), SWT.OPEN | SWT.MULTI );
+        dialog.setText( Messages.getString( "OpenFileAction.Open_File" ) );
+        dialog.setFilterPath( filterPath );
+        dialog.open();
+        String[] names = dialog.getFileNames();
+
+        if ( names != null )
+        {
+            filterPath = dialog.getFilterPath();
+
+            int numberOfFilesNotFound = 0;
+            StringBuffer notFound = new StringBuffer();
+            IWorkbenchPage page = window.getActivePage();
+            for ( String name : names )
+            {
+                IFileStore fileStore = EFS.getLocalFileSystem().getStore( new Path( filterPath ) ).getChild( name );
+                IFileInfo fetchInfo = fileStore.fetchInfo();
+                if ( !fetchInfo.isDirectory() && fetchInfo.exists() )
+                {
+                    try
+                    {
+                        IDE.openEditorOnFileStore( page, fileStore );
+                    }
+                    catch ( PartInitException e )
+                    {
+                        MessageDialog.openError( window.getShell(), Messages.getString( "OpenFileAction.Error" ), e
+                            .getMessage() );
+                    }
+                }
+                else
+                {
+                    if ( ++numberOfFilesNotFound > 1 )
+                    {
+                        notFound.append( '\n' );
+                    }
+                    notFound.append( fileStore.getName() );
+                }
+            }
+
+            if ( numberOfFilesNotFound > 0 )
+            {
+                String msg = MessageFormat.format( numberOfFilesNotFound == 1 ? Messages
+                    .getString( "OpenFileAction.File_not_found" ) : Messages
+                    .getString( "OpenFileAction.Files_not_found" ), new Object[]
+                    { notFound.toString() } );
+                MessageDialog.openError( window.getShell(), Messages.getString( "OpenFileAction.Error" ), msg );
+            }
         }
     }
-
 }
\ No newline at end of file

Modified: directory/sandbox/seelmann/testingframework/rcp/src/main/resources/org/apache/directory/studio/messages.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/rcp/src/main/resources/org/apache/directory/studio/messages.properties?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/rcp/src/main/resources/org/apache/directory/studio/messages.properties (original)
+++ directory/sandbox/seelmann/testingframework/rcp/src/main/resources/org/apache/directory/studio/messages.properties Sat Jun  7 07:17:06 2008
@@ -42,11 +42,10 @@
 
 # Strings used by OpenFileAction Class
 OpenFileAction.Open_File=Open File...
-OpenFileAction.Warning_message=Problem
 OpenFileAction.Open_file_from_filesystem=Open file from filesystem
-OpenFileAction.File_x_does_not_exist=File {0} doesn't exist.
-OpenFileAction.File_x_is_not_readable=File {0} isn't readable.
-OpenFileAction.No_appropriate_editor_found_for_x=No appropriate editor found for {0}.
+OpenFileAction.File_not_found=The file ''{0}'' could not be found.
+OpenFileAction.Files_not_found=The following files could not be found:\n{0}
+OpenFileAction.Error=Error!
 
 # Strings used by ReportABugAction Class
 ReportABugAction.Report_a_bug=Report a bug...

Modified: directory/sandbox/seelmann/testingframework/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/repository/pom.xml?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/repository/pom.xml (original)
+++ directory/sandbox/seelmann/testingframework/repository/pom.xml Sat Jun  7 07:17:06 2008
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
@@ -31,11 +31,11 @@
   <version>${repository.version}</version>
   <name>Apache Directory Studio Repository</name>
   <packaging>pom</packaging>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
 
   <dependencies>
     <!-- Apache Directory Studio launchers binaries -->
@@ -421,6 +421,10 @@
       <groupId>org.eclipse</groupId>
       <artifactId>tomcat</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>carbon</artifactId>
+    </dependency>
 
     <!-- Other dependencies -->
     <dependency>

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/META-INF/MANIFEST.MF?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/META-INF/MANIFEST.MF Sat Jun  7 07:17:06 2008
@@ -18,4 +18,4 @@
 Export-Package: org.apache.directory.studio.schemaeditor.model,
  org.apache.directory.studio.schemaeditor.model.io
 Bundle-ClassPath: .,
- lib/shared-converter-0.9.9-SNAPSHOT.jar
+ lib/shared-converter-0.9.11-SNAPSHOT.jar

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Sat Jun  7 07:17:06 2008
@@ -91,7 +91,7 @@
     public static AttributeTypeImpl getClone( AttributeTypeImpl at )
     {
         AttributeTypeImpl clone = new AttributeTypeImpl( at.getOid() );
-        clone.setNames( at.getNames() );
+        clone.setNames( at.getNamesRef() );
         clone.setSchema( at.getSchema() );
         clone.setDescription( at.getDescription() );
         clone.setSuperiorName( at.getSuperiorName() );
@@ -121,7 +121,7 @@
     public static ObjectClassImpl getClone( ObjectClassImpl oc )
     {
         ObjectClassImpl clone = new ObjectClassImpl( oc.getOid() );
-        clone.setNames( oc.getNames() );
+        clone.setNames( oc.getNamesRef() );
         clone.setSchema( oc.getSchema() );
         clone.setDescription( oc.getDescription() );
         clone.setSuperClassesNames( oc.getSuperClassesNames() );

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Sat Jun  7 07:17:06 2008
@@ -525,7 +525,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) object;
             attributeTypesList.add( at );
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -539,7 +539,7 @@
         {
             MatchingRuleImpl mr = ( MatchingRuleImpl ) object;
             matchingRulesList.add( mr );
-            String[] names = mr.getNames();
+            String[] names = mr.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -553,7 +553,7 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) object;
             objectClassesList.add( oc );
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -567,7 +567,7 @@
         {
             SyntaxImpl syntax = ( SyntaxImpl ) object;
             syntaxesList.add( syntax );
-            String[] names = syntax.getNames();
+            String[] names = syntax.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -632,7 +632,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) object;
             attributeTypesList.remove( at );
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -646,10 +646,10 @@
         {
             MatchingRuleImpl mr = ( MatchingRuleImpl ) object;
             matchingRulesList.remove( mr );
-            String[] names = mr.getNames();
+            String[] names = mr.getNamesRef();
             if ( names != null )
             {
-                for ( String name : mr.getNames() )
+                for ( String name : names )
                 {
                     matchingRulesMap.remove( name.toLowerCase() );
                 }
@@ -660,10 +660,10 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) object;
             objectClassesList.remove( oc );
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( names != null )
             {
-                for ( String name : oc.getNames() )
+                for ( String name : names )
                 {
                     objectClassesMap.remove( name.toLowerCase() );
                 }
@@ -674,10 +674,10 @@
         {
             SyntaxImpl syntax = ( SyntaxImpl ) object;
             syntaxesList.remove( syntax );
-            String[] names = syntax.getNames();
+            String[] names = syntax.getNamesRef();
             if ( names != null )
             {
-                for ( String name : syntax.getNames() )
+                for ( String name : names )
                 {
                     syntaxesMap.remove( name.toLowerCase() );
                 }
@@ -725,7 +725,7 @@
         removeSchemaObject( at1 );
 
         // Updating the attribute type
-        at1.setNames( at2.getNames() );
+        at1.setNames( at2.getNamesRef() );
         at1.setOid( at2.getOid() );
         at1.setDescription( at2.getDescription() );
         at1.setSuperiorName( at2.getSuperiorName() );
@@ -809,7 +809,7 @@
         removeSchemaObject( oc1 );
 
         // Updating the object class
-        oc1.setNames( oc2.getNames() );
+        oc1.setNames( oc2.getNamesRef() );
         oc1.setOid( oc2.getOid() );
         oc1.setDescription( oc2.getDescription() );
         oc1.setSuperClassesNames( oc2.getSuperClassesNames() );

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java Sat Jun  7 07:17:06 2008
@@ -357,17 +357,17 @@
             }
 
             // Aliases
-            if ( ( getNames() == null ) && ( at.getNames() != null ) )
+            if ( ( getNamesRef() == null ) && ( at.getNamesRef() != null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( at.getNames() == null ) )
+            else if ( ( getNamesRef() != null ) && ( at.getNamesRef() == null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( at.getNames() != null ) )
+            else if ( ( getNamesRef() != null ) && ( at.getNamesRef() != null ) )
             {
-                if ( !getNames().equals( at.getNames() ) )
+                if ( !getNamesRef().equals( at.getNamesRef() ) )
                 {
                     return false;
                 }

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java Sat Jun  7 07:17:06 2008
@@ -307,17 +307,17 @@
             }
 
             // Aliases
-            if ( ( getNames() == null ) && ( oc.getNames() != null ) )
+            if ( ( getNamesRef() == null ) && ( oc.getNamesRef() != null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( oc.getNames() == null ) )
+            else if ( ( getNamesRef() != null ) && ( oc.getNamesRef() == null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( oc.getNames() != null ) )
+            else if ( ( getNamesRef() != null ) && ( oc.getNamesRef() != null ) )
             {
-                if ( !getNames().equals( oc.getNames() ) )
+                if ( !getNamesRef().equals( oc.getNamesRef() ) )
                 {
                     return false;
                 }

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java Sat Jun  7 07:17:06 2008
@@ -103,7 +103,7 @@
     {
         for ( AttributeTypeImpl at : attributeTypes )
         {
-            String[] aliases = at.getNames();
+            String[] aliases = at.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )
@@ -140,7 +140,7 @@
     {
         for ( MatchingRuleImpl mr : matchingRules )
         {
-            String[] aliases = mr.getNames();
+            String[] aliases = mr.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )
@@ -186,7 +186,7 @@
     {
         for ( ObjectClassImpl oc : objectClasses )
         {
-            String[] aliases = oc.getNames();
+            String[] aliases = oc.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )
@@ -223,7 +223,7 @@
     {
         for ( SyntaxImpl syntax : syntaxes )
         {
-            String[] aliases = syntax.getNames();
+            String[] aliases = syntax.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java Sat Jun  7 07:17:06 2008
@@ -404,7 +404,7 @@
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
-        String[] so1Names = so1.getNames();
+        String[] so1Names = so1.getNamesRef();
         List<String> so1NamesList = new ArrayList<String>();
         if ( so1Names != null )
         {
@@ -414,7 +414,7 @@
             }
         }
 
-        String[] so2Names = so2.getNames();
+        String[] so2Names = so2.getNamesRef();
         List<String> so2NamesList = new ArrayList<String>();
         if ( so2Names != null )
         {

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Sat Jun  7 07:17:06 2008
@@ -233,7 +233,7 @@
     private void checkAliasesAndOID( SchemaObject object )
     {
         // Aliases
-        String[] aliases = object.getNames();
+        String[] aliases = object.getNamesRef();
         if ( aliases != null )
         {
             for ( String alias : aliases )
@@ -538,7 +538,7 @@
     {
         if ( childSuperClassesNames != null )
         {
-            List<String> aliases = Arrays.asList( oc.getNames() );
+            List<String> aliases = Arrays.asList( oc.getNamesRef() );
             if ( aliases != null )
             {
                 for ( String childSuperClassName : childSuperClassesNames )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Sat Jun  7 07:17:06 2008
@@ -81,7 +81,7 @@
         sb.append( "attributetype ( " + at.getOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // NAME(S)
-        String[] names = at.getNames();
+        String[] names = at.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             sb.append( "\tNAME " ); //$NON-NLS-1$
@@ -211,7 +211,7 @@
         sb.append( "objectclass ( " + oc.getOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // NAME(S)
-        String[] names = oc.getNames();
+        String[] names = oc.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             sb.append( "\tNAME " ); //$NON-NLS-1$

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Sat Jun  7 07:17:06 2008
@@ -240,7 +240,7 @@
         }
 
         // Aliases
-        String[] aliases = at.getNames();
+        String[] aliases = at.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = atNode.addElement( ALIASES_TAG );
@@ -368,7 +368,7 @@
         }
 
         // Aliases
-        String[] aliases = oc.getNames();
+        String[] aliases = oc.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = ocNode.addElement( ALIASES_TAG );
@@ -457,7 +457,7 @@
         }
 
         // Aliases
-        String[] aliases = mr.getNames();
+        String[] aliases = mr.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = mrNode.addElement( ALIASES_TAG );
@@ -516,7 +516,7 @@
         }
 
         // Aliases
-        String[] aliases = syntax.getNames();
+        String[] aliases = syntax.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = syntaxNode.addElement( ALIASES_TAG );

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Sat Jun  7 07:17:06 2008
@@ -357,7 +357,7 @@
         }
 
         // Checking aliases
-        String[] aliases = at.getNames();
+        String[] aliases = at.getNamesRef();
         if ( ( aliases == null ) || ( aliases.length == 0 ) )
         {
             SchemaWarning warning = new NoAliasWarning( at );
@@ -541,7 +541,7 @@
         }
 
         // Checking aliases
-        String[] aliases = oc.getNames();
+        String[] aliases = oc.getNamesRef();
         if ( ( aliases == null ) || ( aliases.length == 0 ) )
         {
             SchemaWarning warning = new NoAliasWarning( oc );
@@ -923,7 +923,7 @@
         }
 
         // Checking aliases
-        String[] aliases = sc.getNames();
+        String[] aliases = sc.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length > 0 ) )
         {
             for ( String alias : aliases )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java Sat Jun  7 07:17:06 2008
@@ -89,8 +89,8 @@
             {
                 public int compare( AttributeTypeImpl at1, AttributeTypeImpl at2 )
                 {
-                    String[] at1Names = ( ( AttributeTypeImpl ) at1 ).getNames();
-                    String[] at2Names = ( ( AttributeTypeImpl ) at2 ).getNames();
+                    String[] at1Names = ( ( AttributeTypeImpl ) at1 ).getNamesRef();
+                    String[] at2Names = ( ( AttributeTypeImpl ) at2 ).getNamesRef();
 
                     if ( ( at1Names == null || at1Names.length == 0 ) && ( at2Names == null || at2Names.length == 0 ) )
                     {
@@ -116,7 +116,7 @@
             // Searching for all matching elements
             for ( AttributeTypeImpl at : atList )
             {
-                for ( String name : at.getNames() )
+                for ( String name : at.getNamesRef() )
                 {
                     Matcher m = pattern.matcher( name );
                     if ( m.matches() )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java Sat Jun  7 07:17:06 2008
@@ -61,7 +61,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java Sat Jun  7 07:17:06 2008
@@ -89,8 +89,8 @@
             {
                 public int compare( ObjectClassImpl oc1, ObjectClassImpl oc2 )
                 {
-                    String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
-                    String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+                    String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
+                    String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
 
                     if ( ( oc1Names == null || oc1Names.length == 0 ) && ( oc2Names == null || oc2Names.length == 0 ) )
                     {
@@ -116,7 +116,7 @@
             // Searching for all matching elements
             for ( ObjectClassImpl oc : ocList )
             {
-                for ( String name : oc.getNames() )
+                for ( String name : oc.getNamesRef() )
                 {
                     Matcher m = pattern.matcher( name );
                     if ( m.matches() )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java Sat Jun  7 07:17:06 2008
@@ -61,7 +61,7 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) element;
 
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")";

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java Sat Jun  7 07:17:06 2008
@@ -41,8 +41,8 @@
     {
         if ( o1 instanceof MatchingRuleImpl && o2 instanceof MatchingRuleImpl )
         {
-            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
-            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
+            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
 
             if ( ( mr1Names != null ) && ( mr2Names != null ) && ( mr1Names.length > 0 ) && ( mr2Names.length > 0 ) )
             {
@@ -51,7 +51,7 @@
         }
         else if ( o1 instanceof MatchingRuleImpl && o2 instanceof NonExistingMatchingRule )
         {
-            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
+            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
             String mr2Name = ( ( NonExistingMatchingRule ) o2 ).getName();
 
             if ( ( mr1Names != null ) && ( mr2Name != null ) && ( mr1Names.length > 0 ) )
@@ -62,7 +62,7 @@
         else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRuleImpl )
         {
             String mr1Name = ( ( NonExistingMatchingRule ) o1 ).getName();
-            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
 
             if ( ( mr1Name != null ) && ( mr2Names != null ) && ( mr2Names.length > 0 ) )
             {

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java Sat Jun  7 07:17:06 2008
@@ -41,8 +41,8 @@
     {
         if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
         {
-            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
-            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
             if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 ) && ( at2Names.length > 0 ) )
             {
@@ -51,7 +51,7 @@
         }
         else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
         {
-            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
             String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
 
             if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.length > 0 ) )
@@ -62,7 +62,7 @@
         else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
         {
             String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
-            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
             if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.length > 0 ) )
             {

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java Sat Jun  7 07:17:06 2008
@@ -43,7 +43,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) obj;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java Sat Jun  7 07:17:06 2008
@@ -41,8 +41,8 @@
     {
         if ( o1 instanceof SyntaxImpl && o2 instanceof SyntaxImpl )
         {
-            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
-            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
+            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
+            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
 
             if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.length > 0 )
                 && ( syntax2Names.length > 0 ) )
@@ -52,7 +52,7 @@
         }
         else if ( o1 instanceof SyntaxImpl && o2 instanceof NonExistingSyntax )
         {
-            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
+            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
             String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
 
             if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.length > 0 ) )
@@ -63,7 +63,7 @@
         else if ( o1 instanceof NonExistingSyntax && o2 instanceof SyntaxImpl )
         {
             String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
-            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
+            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
 
             if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.length > 0 ) )
             {

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java Sat Jun  7 07:17:06 2008
@@ -54,7 +54,7 @@
 
             List<String> names = new ArrayList<String>();
 
-            String[] atNames = inputAT.getNames();
+            String[] atNames = inputAT.getNamesRef();
             if ( atNames != null )
             {
                 for ( String name : atNames )
@@ -86,8 +86,8 @@
                 {
                     if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
-                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
+                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
                             && ( oc2Names.length > 0 ) )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java Sat Jun  7 07:17:06 2008
@@ -54,7 +54,7 @@
 
             List<String> names = new ArrayList<String>();
 
-            String[] atNames = inputAT.getNames();
+            String[] atNames = inputAT.getNamesRef();
             if ( atNames != null )
             {
                 for ( String name : atNames )
@@ -86,8 +86,8 @@
                 {
                     if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
-                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
+                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
                             && ( oc2Names.length > 0 ) )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java Sat Jun  7 07:17:06 2008
@@ -60,7 +60,7 @@
     {
         if ( element instanceof ObjectClassImpl )
         {
-            return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNames() );
+            return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNamesRef() );
         }
 
         // Default

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Sat Jun  7 07:17:06 2008
@@ -73,7 +73,7 @@
      */
     public String getName()
     {
-        String[] names = attributeType.getNames();
+        String[] names = attributeType.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             return names[0];

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Sat Jun  7 07:17:06 2008
@@ -259,7 +259,7 @@
     {
         public void widgetSelected( SelectionEvent e )
         {
-            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNames() );
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNamesRef() );
             if ( editDialog.open() != Window.OK )
             {
                 return;
@@ -267,9 +267,9 @@
             if ( editDialog.isDirty() )
             {
                 modifiedAttributeType.setNames( editDialog.getAliases() );
-                if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().length != 0 ) )
+                if ( ( modifiedAttributeType.getNamesRef() != null ) && ( modifiedAttributeType.getNamesRef().length != 0 ) )
                 {
-                    aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
+                    aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNamesRef() ) );
                 }
                 else
                 {
@@ -391,7 +391,7 @@
             if ( selectedItem instanceof AttributeTypeImpl )
             {
                 AttributeTypeImpl at = ( AttributeTypeImpl ) selectedItem;
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     modifiedAttributeType.setSuperiorName( names[0] );
@@ -843,9 +843,9 @@
     private void fillInUiFields()
     {
         // ALIASES Label
-        if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().length != 0 ) )
+        if ( ( modifiedAttributeType.getNamesRef() != null ) && ( modifiedAttributeType.getNamesRef().length != 0 ) )
         {
-            aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
+            aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNamesRef() ) );
         }
         else
         {

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Sat Jun  7 07:17:06 2008
@@ -262,7 +262,7 @@
         // As Mandatory Attribute Section
         Section mandatoryAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
             | Section.TITLE_BAR );
-        String names[] = modifiedAttributeType.getNames();
+        String names[] = modifiedAttributeType.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             mandatoryAttributeSection.setDescription( "The attribute type" + " '" + ViewUtils.concateAliases( names )
@@ -305,7 +305,7 @@
         // Matching Rules Section
         Section optionalAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
             | Section.TITLE_BAR );
-        String names[] = modifiedAttributeType.getNames();
+        String names[] = modifiedAttributeType.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             optionalAttributeSection.setDescription( "The attribute type" + " '" + ViewUtils.concateAliases( names )

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java Sat Jun  7 07:17:06 2008
@@ -84,8 +84,8 @@
                 {
                     if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
                         if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 )
                             && ( at2Names.length > 0 ) )
@@ -95,7 +95,7 @@
                     }
                     else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
                         String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
 
                         if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.length > 0 ) )
@@ -106,7 +106,7 @@
                     else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
                     {
                         String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
                         if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.length > 0 ) )
                         {

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Sat Jun  7 07:17:06 2008
@@ -63,7 +63,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Sat Jun  7 07:17:06 2008
@@ -71,7 +71,7 @@
      */
     public String getName()
     {
-        String[] names = objectClass.getNames();
+        String[] names = objectClass.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             return names[0];



Mime
View raw message