svn commit: r554874 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor: model/openldapfile/ view/editors/attributetype/ view/editors/objectclass/ view/editors/schema/

[pa...@apache.org]

Author: pamarcelot
Date: Tue Jul 10 02:05:24 2007
New Revision: 554874

URL: http://svn.apache.org/viewvc?view=rev&rev=554874
Log:
Prefixed the class names with 'OpenLdap'.

Added:
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaExporter.java
      - copied, changed from r554698, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaExporter.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImportException.java
      - copied, changed from r554696, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImportException.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImporter.java
      - copied, changed from r554696, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImporter.java
Removed:
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaExporter.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImportException.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImporter.java
Modified:
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java

Copied: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaExporter.java (from r554698, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaExporter.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaExporter.java?view=diff&rev=554874&p1=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaExporter.java&r1=554698&p2=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaExporter.java&r2=554874
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaExporter.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaExporter.java Tue Jul 10 02:05:24 2007
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SchemaExporter
+public class OpenLdapSchemaExporter
 {
     /**
      * Converts the given schema to its source code representation

Copied: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImportException.java (from r554696, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImportException.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImportException.java?view=diff&rev=554874&p1=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImportException.java&r1=554696&p2=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImportException.java&r2=554874
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImportException.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImportException.java Tue Jul 10 02:05:24 2007
@@ -21,23 +21,23 @@
 
 
 /**
- * This class represents the SchemaFileImportException.
+ * This class represents the OpenLdapSchemaFileImportException.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SchemaFileImportException extends Exception
+public class OpenLdapSchemaFileImportException extends Exception
 {
     private static final long serialVersionUID = 1L;
 
 
     /**
-     * Creates a new instance of SchemaFileImportException.
+     * Creates a new instance of OpenLdapSchemaFileImportException.
      *
      * @param message
      *      the message
      */
-    public SchemaFileImportException( String message )
+    public OpenLdapSchemaFileImportException( String message )
     {
         super( message );
     }

Copied: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImporter.java (from r554696, directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImporter.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImporter.java?view=diff&rev=554874&p1=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImporter.java&r1=554696&p2=directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImporter.java&r2=554874
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/SchemaFileImporter.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/openldapfile/OpenLdapSchemaFileImporter.java Tue Jul 10 02:05:24 2007
@@ -42,20 +42,30 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SchemaFileImporter
+public class OpenLdapSchemaFileImporter
 {
-    public static Schema getSchema( String path ) throws SchemaFileImportException
+    /**
+     * Extracts the Schema from the given path.
+     *
+     * @param path
+     *      the path of the file.
+     * @return
+     *      the corresponding schema
+     * @throws OpenLdapSchemaFileImportException
+     *      if an error occurrs when importing the schema
+     */
+    public static Schema getSchema( String path ) throws OpenLdapSchemaFileImportException
     {
         File file = new File( path );
 
         // Checking the file properties
         if ( !file.exists() )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' does not exist." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' does not exist." );
         }
         else if ( !file.canRead() )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' can not be read." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' can not be read." );
         }
 
         InputStream in = null;
@@ -65,11 +75,11 @@
         }
         catch ( MalformedURLException e )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' can not be read correctly." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' can not be read correctly." );
         }
         catch ( IOException e )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' can not be read correctly." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' can not be read correctly." );
         }
 
         OpenLdapSchemaParser parser = null;
@@ -79,7 +89,7 @@
         }
         catch ( IOException e )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' can not be read correctly." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' can not be read correctly." );
         }
 
         try
@@ -88,11 +98,11 @@
         }
         catch ( IOException e )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' can not be read correctly." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' can not be read correctly." );
         }
         catch ( ParseException e )
         {
-            throw new SchemaFileImportException( "The file '" + path + "' can not be read correctly." );
+            throw new OpenLdapSchemaFileImportException( "The file '" + path + "' can not be read correctly." );
         }
 
         String schemaName = getNameFromPath( path );

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?view=diff&rev=554874&r1=554873&r2=554874
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Tue Jul 10 02:05:24 2007
@@ -28,7 +28,7 @@
 import org.apache.directory.server.core.tools.schema.AttributeTypeLiteral;
 import org.apache.directory.server.core.tools.schema.OpenLdapSchemaParser;
 import org.apache.directory.studio.apacheds.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.apacheds.schemaeditor.model.openldapfile.SchemaExporter;
+import org.apache.directory.studio.apacheds.schemaeditor.model.openldapfile.OpenLdapSchemaExporter;
 import org.apache.directory.studio.apacheds.schemaeditor.view.widget.SchemaSourceViewer;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.Document;
@@ -155,7 +155,7 @@
     private void fillInUiFields()
     {
         // SOURCE CODE Field
-        schemaSourceViewer.getDocument().set( SchemaExporter.toSourceCode( modifiedAttributeType ) );
+        schemaSourceViewer.getDocument().set( OpenLdapSchemaExporter.toSourceCode( modifiedAttributeType ) );
     }
 
 

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?view=diff&rev=554874&r1=554873&r2=554874
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Tue Jul 10 02:05:24 2007
@@ -28,7 +28,7 @@
 import org.apache.directory.server.core.tools.schema.ObjectClassLiteral;
 import org.apache.directory.server.core.tools.schema.OpenLdapSchemaParser;
 import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl;
-import org.apache.directory.studio.apacheds.schemaeditor.model.openldapfile.SchemaExporter;
+import org.apache.directory.studio.apacheds.schemaeditor.model.openldapfile.OpenLdapSchemaExporter;
 import org.apache.directory.studio.apacheds.schemaeditor.view.widget.SchemaSourceViewer;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.Document;
@@ -153,7 +153,7 @@
     private void fillInUiFields()
     {
         // SOURCE CODE Field
-        schemaSourceViewer.getDocument().set( SchemaExporter.toSourceCode( modifiedObjectClass ) );
+        schemaSourceViewer.getDocument().set( OpenLdapSchemaExporter.toSourceCode( modifiedObjectClass ) );
     }
 
 

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java?view=diff&rev=554874&r1=554873&r2=554874
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java Tue Jul 10 02:05:24 2007
@@ -29,7 +29,7 @@
 import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.apacheds.schemaeditor.model.Schema;
 import org.apache.directory.studio.apacheds.schemaeditor.model.SyntaxImpl;
-import org.apache.directory.studio.apacheds.schemaeditor.model.openldapfile.SchemaExporter;
+import org.apache.directory.studio.apacheds.schemaeditor.model.openldapfile.OpenLdapSchemaExporter;
 import org.apache.directory.studio.apacheds.schemaeditor.view.widget.SchemaSourceViewer;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.Document;
@@ -228,6 +228,6 @@
      */
     private void fillInUiFields()
     {
-        schemaSourceViewer.getDocument().set( SchemaExporter.toSourceCode( schema ) );
+        schemaSourceViewer.getDocument().set( OpenLdapSchemaExporter.toSourceCode( schema ) );
     }
 }