Merge pull request #59 from groupdocs-viewer/fix_for_dwg_eml_epub_msg_mpp_pptx

Fixed bugs with dwg, eml, epub, msg, mpp and pptx

Author: bobkovalex

pom.xml

@@ -86,6 +86,8 @@
     <properties>
         <start-class>com.groupdocs.ui.Application</start-class>
         <java.version>1.8</java.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

src/main/java/com/groupdocs/ui/cache/FileViewerCache.java

@@ -1,15 +1,14 @@
 package com.groupdocs.ui.cache;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.groupdocs.ui.cache.mixin.PageMixIn;
-import com.groupdocs.ui.cache.mixin.PdfViewInfoMixIn;
-import com.groupdocs.ui.cache.mixin.ViewInfoMixIn;
+import com.groupdocs.ui.cache.mixin.*;
 import com.groupdocs.ui.exception.DiskAccessException;
-import com.groupdocs.viewer.results.Page;
-import com.groupdocs.viewer.results.PdfViewInfo;
-import com.groupdocs.viewer.results.ViewInfo;
+import com.groupdocs.ui.exception.TotalGroupDocsException;
+import com.groupdocs.viewer.results.*;
+import com.groupdocs.viewer.results.Character;
 import com.groupdocs.viewer.utils.PathUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -20,9 +19,17 @@ public class FileViewerCache implements ViewerCache {
     private static final long WAIT_TIMEOUT = 100L;
 
     static {
-        MAPPER.addMixIn(ViewInfo.class, ViewInfoMixIn.class);
-        MAPPER.addMixIn(PdfViewInfo.class, PdfViewInfoMixIn.class);
+        MAPPER.addMixIn(CadViewInfo.class, CadViewInfoMixIn.class);
+        MAPPER.addMixIn(Character.class, CharacterMixIn.class);
+        MAPPER.addMixIn(Layer.class, LayerMixIn.class);
+        MAPPER.addMixIn(Layout.class, LayoutMixIn.class);
+        MAPPER.addMixIn(Line.class, LineMixIn.class);
+        MAPPER.addMixIn(OutlookViewInfo.class, OutlookViewInfoMixIn.class);
         MAPPER.addMixIn(Page.class, PageMixIn.class);
+        MAPPER.addMixIn(PdfViewInfo.class, PdfViewInfoMixIn.class);
+        MAPPER.addMixIn(ProjectManagementViewInfo.class, ProjectManagementViewInfoMixIn.class);
+        MAPPER.addMixIn(ViewInfo.class, ViewInfoMixIn.class);
+        MAPPER.addMixIn(Word.class, WordMixIn.class);
     }
 
     /**
@@ -103,8 +110,8 @@ public <T> T getValue(String key, T defaultEntry, Class<?>[] clazzs) {
             for (Class<?> clazz : clazzs) {
                 final FileInputStream inputStream = new FileInputStream(cacheFilePath);
                 try {
-                    return (T) MAPPER.readValue(inputStream, clazz);
-                } catch (UnrecognizedPropertyException e) {
+                    return (T)  MAPPER.readValue(inputStream, clazz);
+                } catch (UnrecognizedPropertyException | InvalidDefinitionException e) {
                     // continue;
                 } finally {
                     inputStream.close();
@@ -117,7 +124,7 @@ public <T> T getValue(String key, T defaultEntry, Class<?>[] clazzs) {
                 throw new RuntimeException(ex);
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new TotalGroupDocsException("Cache loading error", e);
         }
         return null;
     }
@@ -137,9 +144,9 @@ public String getCacheFilePath(String key) {
     }
 
     @Override
-    public boolean contains(String key) {
+    public boolean doesNotContains(String key) {
         String file = PathUtils.combine(this.getCachePath(), this.getCacheSubFolder(), key);
-        return new File(file).exists();
+        return !new File(file).exists();
     }
 
     private OutputStream getStream(String path) throws FileNotFoundException, InterruptedException {

src/main/java/com/groupdocs/ui/cache/ViewerCache.java

@@ -38,5 +38,5 @@ public interface ViewerCache {
      */
     String getCacheFilePath(String key);
 
-    boolean contains(String key);
+    boolean doesNotContains(String key);
 }

src/main/java/com/groupdocs/ui/cache/mixin/CadViewInfoMixIn.java

@@ -0,0 +1,15 @@
+package com.groupdocs.ui.cache.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.groupdocs.viewer.FileType;
+import com.groupdocs.viewer.results.Layer;
+import com.groupdocs.viewer.results.Layout;
+import com.groupdocs.viewer.results.Page;
+
+import java.util.List;
+
+public abstract class CadViewInfoMixIn {
+    CadViewInfoMixIn(@JsonProperty("fileType") FileType fileType, @JsonProperty("pages") List<Page> pages, @JsonProperty("layers") List<Layer> layers, @JsonProperty("layouts") List<Layout> layouts) {
+    }
+
+}

src/main/java/com/groupdocs/ui/cache/mixin/CharacterMixIn.java

@@ -0,0 +1,11 @@
+package com.groupdocs.ui.cache.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.groupdocs.viewer.results.Character;
+
+import java.util.List;
+
+public abstract class CharacterMixIn {
+    CharacterMixIn(@JsonProperty("character") char character, @JsonProperty("x") double x, @JsonProperty("y") double y, @JsonProperty("width") double width, @JsonProperty("height") double height) {
+    }
+}

src/main/java/com/groupdocs/ui/cache/mixin/LayerMixIn.java

@@ -0,0 +1,11 @@
+package com.groupdocs.ui.cache.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.groupdocs.viewer.results.Line;
+
+import java.util.List;
+
+public abstract class LayerMixIn {
+    LayerMixIn(@JsonProperty("name") String name, @JsonProperty("visible") boolean visible) {
+    }
+}

src/main/java/com/groupdocs/ui/cache/mixin/LayoutMixIn.java

@@ -0,0 +1,8 @@
+package com.groupdocs.ui.cache.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public abstract class LayoutMixIn {
+    LayoutMixIn(@JsonProperty("name") String name, @JsonProperty("width") double width, @JsonProperty("height") double height) {
+    }
+}

src/main/java/com/groupdocs/ui/cache/mixin/LineMixIn.java

@@ -0,0 +1,11 @@
+package com.groupdocs.ui.cache.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.groupdocs.viewer.results.Word;
+
+import java.util.List;
+
+public abstract class LineMixIn {
+    LineMixIn(@JsonProperty("line") String line, @JsonProperty("x") double x, @JsonProperty("y") double y, @JsonProperty("width") double width, @JsonProperty("height") double height, @JsonProperty("words") List<Word> words) {
+    }
+}

src/main/java/com/groupdocs/ui/cache/mixin/OutlookViewInfoMixIn.java

@@ -0,0 +1,13 @@
+package com.groupdocs.ui.cache.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.groupdocs.viewer.FileType;
+import com.groupdocs.viewer.results.Page;
+
+import java.util.List;
+
+public abstract class OutlookViewInfoMixIn {
+    OutlookViewInfoMixIn(@JsonProperty("fileType") FileType fileType, @JsonProperty("pages") List<Page> pages, @JsonProperty("folders") List<String> folders) {
+    }
+
+}

src/main/java/com/groupdocs/ui/cache/mixin/PageMixIn.java

@@ -8,5 +8,4 @@
 public abstract class PageMixIn {
     PageMixIn(@JsonProperty("number") int number, @JsonProperty("visible") boolean visible, @JsonProperty("width") int width, @JsonProperty("height") int height, @JsonProperty("lines") List<Line> lines) {
     }
-
 }