INTEGRATION: CWS fwkbugfix02 (1.3.12); FILE MERGED

2004/04/01 14:33:46 mav 1.3.12.1: #116056# adopt implementation to the design change

1 files changed, 11 insertions, 11 deletions

diff --git a/package/qa/storages/Test04.java b/package/qa/storages/Test04.java
index 6f98682c8..02cfbc173 100644
--- a/package/qa/storages/Test04.java
+++ b/package/qa/storages/Test04.java
@@ -56,7 +56,7 @@ public class Test04 implements StorageTest {
             // first substorage of the root storage
             XStorage xTempSubStorage1 = m_aTestHelper.openSubStorage( xTempStorage,
                                                                         "SubStorage1",
-                                                                        ElementModes.ELEMENT_WRITE );
+                                                                        ElementModes.WRITE );
             if ( xTempSubStorage1 == null )
             {
                 m_aTestHelper.Error( "Can't create substorage!" );
@@ -72,7 +72,7 @@ public class Test04 implements StorageTest {
             // second substorage of the root storage
             XStorage xTempSubStorage2 = m_aTestHelper.openSubStorage( xTempStorage,
                                                                         "SubStorage2",
-                                                                        ElementModes.ELEMENT_WRITE );
+                                                                        ElementModes.WRITE );
             if ( xTempSubStorage2 == null )
             {
                 m_aTestHelper.Error( "Can't create substorage!" );
@@ -89,27 +89,27 @@ public class Test04 implements StorageTest {
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             "MediaType3",
                                                             true,
-                                                            ElementModes.ELEMENT_WRITE ) )
+                                                            ElementModes.WRITE ) )
                 return false;
 
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage1,
                                                             "MediaType4",
                                                             false,
-                                                            ElementModes.ELEMENT_WRITE ) )
+                                                            ElementModes.WRITE ) )
                 return false;
     
             // set "MediaType" property for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage2,
                                                             "MediaType5",
                                                             false,
-                                                            ElementModes.ELEMENT_WRITE ) )
+                                                            ElementModes.WRITE ) )
                 return false;
     
             // create temporary storage based on a previously created temporary file
             Object pArgs[] = new Object[2];
             pArgs[0] = (Object) sTempFileURL;
-            pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+            pArgs[1] = new Integer( ElementModes.WRITE );
 
             Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
             XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage );
@@ -170,7 +170,7 @@ public class Test04 implements StorageTest {
             // ================================================
 
             // the temporary file must not be locked any more after storage disposing
-            pArgs[1] = new Integer( ElementModes.ELEMENT_WRITE );
+            pArgs[1] = new Integer( ElementModes.WRITE );
             Object oResStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
             XStorage xResStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResStorage );
             if ( xResStorage == null )
@@ -182,28 +182,28 @@ public class Test04 implements StorageTest {
             // open and check SubStorage1
             XStorage xResSubStorage1 = m_aTestHelper.openSubStorage( xResStorage,
                                                                         "SubStorage1",
-                                                                        ElementModes.ELEMENT_READ );
+                                                                        ElementModes.READ );
             if ( xResSubStorage1 == null )
             {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
     
-            if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.ELEMENT_READ ) )
+            if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1, "MediaType4", false, ElementModes.READ ) )
                 return false;
 
 
             // open and check SubStorage2
             XStorage xResSubStorage2 = m_aTestHelper.openSubStorage( xResStorage,
                                                                         "SubStorage2",
-                                                                        ElementModes.ELEMENT_READ );
+                                                                        ElementModes.READ );
             if ( xResSubStorage2 == null )
             {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
 
-            if ( !m_aTestHelper.checkStorageProperties( xResSubStorage2, "MediaType5", false, ElementModes.ELEMENT_READ ) )
+            if ( !m_aTestHelper.checkStorageProperties( xResSubStorage2, "MediaType5", false, ElementModes.READ ) )
                 return false;