兼容缺失命名空间对象的，导致的IAE。

资源加载器增加了toString方法便于IDE调试
purewind · Sep 22, 2021 · ee64df6 · ee64df6
1 parent b8c946f
commit ee64df6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 0 deletions.
diff --git a/ofdrw-core/src/main/java/org/ofdrw/core/action/actionType/OFDAction.java b/ofdrw-core/src/main/java/org/ofdrw/core/action/actionType/OFDAction.java
@@ -26,14 +26,19 @@ static OFDAction getInstance(Element element) {
         String qName = element.getQualifiedName();
         switch (qName) {
             case "ofd:Goto":
+            case "Goto":
                 return new Goto(element);
             case "ofd:URI":
+            case "URI":
                 return new URI(element);
             case "ofd:GotoA":
+            case "GotoA":
                 return new GotoA(element);
             case "ofd:Sound":
+            case "Sound":
                 return new Sound(element);
             case "ofd:Movies":
+            case "Movies":
                 return new Movie(element);
             default:
                 throw new IllegalArgumentException("未知的动作类型：" + qName);

diff --git a/ofdrw-core/src/main/java/org/ofdrw/core/basicStructure/pageObj/layer/PageBlockType.java b/ofdrw-core/src/main/java/org/ofdrw/core/basicStructure/pageObj/layer/PageBlockType.java
@@ -25,21 +25,27 @@ static PageBlockType getInstance(Element element) {
         PageBlockType res = null;
         switch (qName) {
             case "ofd:TextObject":
+            case "TextObject":
                 res = new TextObject(element);
                 break;
             case "ofd:PathObject":
+            case "PathObject":
                 res = new PathObject(element);
                 break;
             case "ofd:ImageObject":
+            case "ImageObject":
                 res = new ImageObject(element);
                 break;
             case "ofd:CompositeObject":
+            case "CompositeObject":
                 res = new CompositeObject(element);
                 break;
             case "ofd:PageBlock":
+            case "PageBlock":
                 res = new CT_PageBlock(element);
                 break;
             case "ofd:Layer":
+            case "Layer":
                 res = new CT_Layer(element);
                 break;
             default:

diff --git a/ofdrw-core/src/main/java/org/ofdrw/core/basicStructure/res/OFDResource.java b/ofdrw-core/src/main/java/org/ofdrw/core/basicStructure/res/OFDResource.java
@@ -25,18 +25,23 @@ static OFDResource getInstance(Element element) {
         OFDResource res = null;
         switch (qName) {
             case "ofd:ColorSpaces":
+            case "ColorSpaces":
                 res = new ColorSpaces(element);
                 break;
             case "ofd:DrawParams":
+            case "DrawParams":
                 res = new DrawParams(element);
                 break;
             case "ofd:Fonts":
+            case "Fonts":
                 res = new Fonts(element);
                 break;
             case "ofd:MultiMedias":
+            case "MultiMedias":
                 res = new MultiMedias(element);
                 break;
             case "ofd:CompositeGraphicUnits":
+            case "CompositeGraphicUnits":
                 res = new CompositeGraphicUnits(element);
                 break;
             default:

diff --git a/ofdrw-core/src/main/java/org/ofdrw/core/graph/tight/CT_Area.java b/ofdrw-core/src/main/java/org/ofdrw/core/graph/tight/CT_Area.java
@@ -87,21 +87,27 @@ public List<Command> getCommands() {
             String qName = item.getQualifiedName();
             switch (qName) {
                 case "ofd:Move":
+                case "Move":
                     elementList.add(new Move(item));
                     break;
                 case "ofd:Line":
+                case "Line":
                     elementList.add(new Line(item));
                     break;
                 case "ofd:QuadraticBezier":
+                case "QuadraticBezier":
                     elementList.add(new QuadraticBezier(item));
                     break;
                 case "ofd:CubicBezier":
+                case "CubicBezier":
                     elementList.add(new CubicBezier(item));
                     break;
                 case "ofd:Arc":
+                case "Arc":
                     elementList.add(new Arc(item));
                     break;
                 case "ofd:Close":
+                case "Close":
                     elementList.add(new Close(item));
                     break;
                 default:

diff --git a/ofdrw-core/src/main/java/org/ofdrw/core/pageDescription/clips/ClipAble.java b/ofdrw-core/src/main/java/org/ofdrw/core/pageDescription/clips/ClipAble.java
@@ -29,9 +29,11 @@ static ClipAble getInstance(Element e) {
         ClipAble res = null;
         switch (qName) {
             case "ofd:Path":
+            case "Path":
                 res = new CT_Path(e);
                 break;
             case "ofd:Text":
+            case "Text":
                 res = new CT_Text(e);
                 break;
             default:

diff --git a/ofdrw-reader/src/main/java/org/ofdrw/reader/ResourceLocator.java b/ofdrw-reader/src/main/java/org/ofdrw/reader/ResourceLocator.java
@@ -494,4 +494,8 @@ public VirtualContainer getContainer(String containerPath) throws FileNotFoundEx
         }
     }
 
+    @Override
+    public String toString() {
+        return pwd();
+    }
 }