Changeset 126

Timestamp:

04/29/06 03:01:55 (2 years ago)

Author:

jordi

Message:

Now loading a password protected file works as well using the new observable method.

Files:

• trunk/src/IDocument.cxx (modified) (3 diffs)
• trunk/src/IDocument.h (modified) (1 diff)
• trunk/src/IDocumentObserver.h (modified) (1 diff)
• trunk/src/IJob.h (modified) (1 diff)
• trunk/src/JobLoad.cxx (modified) (4 diffs)
• trunk/tests/DumbDocumentObserver.cxx (modified) (6 diffs)
• trunk/tests/DumbDocumentObserver.h (modified) (2 diffs)
• trunk/tests/PDFDocumentTest.cxx (modified) (7 diffs)
• trunk/tests/PDFDocumentTest.h (modified) (1 diff)

trunk/src/IDocument.cxx

@@ -252 +252 @@
-
-void
-Error (GError *error
+ (
-{
-    for ( GList *item = g_list_first (m_Observers) ; NULL != item ;
@@ -258 +258 @@
-    {
-        IDocumentObserver *observer = (IDocumentObserver *)item->data;
+        observer->notifyLoad ();
+    }
+}
+
+void
+IDocument::notifyLoadError (const GError *error)
+{
+    for ( GList *item = g_list_first (m_Observers) ; NULL != item ;
+          item = g_list_next (item) )
+    {
+        IDocumentObserver *observer = (IDocumentObserver *)item->data;
-        observer->notifyLoadError (error);
-    }
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -269 +290 @@
-    job->setDocument (this);
-    job->setFileName (fileName);
-NULL
+password
-
-    IJob::queue (job);

trunk/src/IDocument.h

@@ -177 +177 @@
-            void deattach (const IDocumentObserver *observer);
-
-
+
+
+
-            
-            const gchar *getTitle (void);

trunk/src/IDocumentObserver.h

@@ -25 +25 @@
-        public:
-            virtual ~IDocumentObserver (void) { }
-
+
+
-            virtual void notifyLoadError (const GError *error) { }
+            virtual void notifyLoadPassword (const GError *error) { }
-
-        protected:

trunk/src/IJob.h

@@ -21 +21 @@
-#if defined DEBUG
-#define JOB_NOTIFIER(callback, data) callback (data)
+#define JOB_DELETE TRUE
+#define JOB_NOTIFIER_END()
-#else // !DEBUG
-#define JOB_NOTIFIER(callback, data) g_idle_add (callback, data)
+#define JOB_DELETE FALSE
+#define JOB_NOTIFIER_END() delete job
-#endif // !DEBUG
-

trunk/src/JobLoad.cxx

@@ -110 +110 @@
-        JOB_NOTIFIER (job_load_done, this);
-    }
-    else if ( DocumentErrorEncrypted == error->code )
-    {
-        g_error_free (error);
-        JOB_NOTIFIER (job_load_password, this);
-    }
-    else
-    {
-        setError (error);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -191 +194 @@
-
-    JobLoad *job = (JobLoad *)data;
-
+
+
+
-    return FALSE;
-}
@@ -210 +215 @@
-    JobLoad *job = (JobLoad *)data;
-    job->getDocument ().notifyLoadError (job->getError ());
+    JOB_NOTIFIER_END();
-    
-    return FALSE;
@@ -231 +237 @@
-
-    JobLoad *job = (JobLoad *)data;
-
-return job_load_done (data
-
+
+JOB_NOTIFIER_END(
+

trunk/tests/DumbDocumentObserver.cxx

@@ -26 +26 @@
-    m_Error = NULL;
-    m_NotifiedError = FALSE;
+    m_NotifiedPassword = FALSE;
+    m_NotifiedLoad = FALSE;
-}
-
-DumbDocumentObserver::~DumbDocumentObserver ()
-{
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -39 +44 @@
-DumbDocumentObserver::notifyLoadError (const GError *error)
-{
-
-
-
-
-
+
-    m_NotifiedError = TRUE;
+}
+
+void
+DumbDocumentObserver::notifyLoadPassword (const GError *error)
+{
+    setLoadError (error);
+    m_NotifiedPassword = TRUE;
-}
-
@@ -72 +80 @@
-DumbDocumentObserver::loadFinished (void)
-{
-
+ || m_NotifiedPassword || m_NotifiedLoad
-}
-
@@ -86 +94 @@
-DumbDocumentObserver::notifiedLoaded (void)
-{
-
+
+
+
-}
-
@@ -92 +102 @@
-DumbDocumentObserver::notifiedPassword (void)
-{
-
+
+
+
-}
-
@@ -106 +118 @@
-    return FALSE;
-}
+
+void
+DumbDocumentObserver::setLoadError (const GError *error)
+{
+    if ( NULL != m_Error )
+    {
+        g_error_free (m_Error);
+    }
+    if ( NULL != error )
+    {        
+        m_Error = g_error_copy (error);
+    }    
+}

trunk/tests/DumbDocumentObserver.h

@@ -27 +27 @@
-            ~DumbDocumentObserver (void);
-
+            void notifyLoad (void);
-            void notifyLoadError (const GError *error);
+            void notifyLoadPassword (const GError *error);
-
-            gint getCurrentPage (void);
@@ -38 +40 @@
-            gboolean notifiedRotation (void);
-            gboolean notifiedZoom (void);
+            void setLoadError (const GError *error);
-
-        protected:
-            GError *m_Error;
-            gboolean m_NotifiedError;
+            gboolean m_NotifiedLoad;
+            gboolean m_NotifiedPassword;
-    };
-}

trunk/tests/PDFDocumentTest.cxx

@@ -102 +102 @@
-    m_Document->load (testFile, NULL);
-    while ( !m_Observer->loadFinished () ) { }
+    CPPUNIT_ASSERT (m_Observer->notifiedError ());
-    CPPUNIT_ASSERT (!m_Document->isLoaded ());
-    CPPUNIT_ASSERT (m_Observer->notifiedError ());
-
-    gchar *documentError = IDocument::getErrorMessage(DocumentErrorOpenFile);
@@ -145 +145 @@
-    g_free (errorMessage);
-}
-
+
-///
-/// @brief Test to load an encrypted file using invalid passwords.
@@ -157 +157 @@
-PDFDocumentTest::encryptedFile (void)
-{
-    GError *error = NULL;
-    gchar *testFile = getTestFile ("test_encrypted.pdf");
-
-
+
+
+
-    CPPUNIT_ASSERT (!m_Document->isLoaded ());
-    CPPUNIT_ASSERT (m_Observer->notifiedPassword ());
-
-    gchar *documentError = IDocument::getErrorMessage(DocumentErrorEncrypted);
@@ -168 +167 @@
-            "Failed to load document '%s'.\n%s\n", testFile, documentError);
-    g_free(documentError);
-
+const GError *
-    DocumentError errorCode = (DocumentError)error->code;
-    CPPUNIT_ASSERT_EQUAL (DocumentErrorEncrypted, errorCode);
@@ -176 +175 @@
-    
-    // Now try with an invalid password...
-error = NULL
-CPPUNIT_ASSERT (m_Document->loadFile (testFile, "invalidpasswd", &error));
-while ( !m_Observer->loadFinished () ) { }
+m_Document->load (testFile, "invalidpasswd")
+while ( !m_Observer->loadFinished () ) { }
+CPPUNIT_ASSERT (m_Observer->notifiedPassword ());
-    CPPUNIT_ASSERT (!m_Document->isLoaded ());
-    CPPUNIT_ASSERT (m_Observer->notifiedPassword ());
-
-    documentError = IDocument::getErrorMessage(DocumentErrorEncrypted);
@@ -195 +193 @@
-    // And now, just to test that it can load the pdf using the 
-    // correct password.
-
-
-
-
+
+
-    CPPUNIT_ASSERT (m_Observer->notifiedLoaded ());
+    CPPUNIT_ASSERT (m_Document->isLoaded ());
-    CPPUNIT_ASSERT_EQUAL (0,
-            g_ascii_strcasecmp (testFile, m_Document->getFileName ()));
@@ -207 +204 @@
-    g_free (testFile);
-}
-
+
-///
-/// @brief Test to open a valid file.

trunk/tests/PDFDocumentTest.h

@@ -29 +29 @@
-        CPPUNIT_TEST (fileNotFound);
-        CPPUNIT_TEST (invalidFile);
-/*
-
+
+/*
-        CPPUNIT_TEST (relativePath);
-        CPPUNIT_TEST (pageChange);