shapes fix

This commit is contained in:
Jindra Petřík
2014-11-12 10:49:34 +01:00
parent 80d85636f2
commit e5c2a76e0a
4 changed files with 12 additions and 12 deletions

View File

@@ -66,12 +66,12 @@ public class DefineShape2Tag extends ShapeTag {
@Override
public void getNeededCharacters(Set<Integer> needed) {
shapes.getNeededCharacters(needed);
getShapes().getNeededCharacters(needed);
}
@Override
public boolean removeCharacter(int characterId) {
boolean modified = shapes.removeCharacter(characterId);
boolean modified = getShapes().removeCharacter(characterId);
if (modified) {
setModified(true);
}
@@ -124,7 +124,7 @@ public class DefineShape2Tag extends ShapeTag {
try {
sos.writeUI16(shapeId);
sos.writeRECT(shapeBounds);
sos.writeSHAPEWITHSTYLE(shapes, 2);
sos.writeSHAPEWITHSTYLE(getShapes(), 2);
} catch (IOException e) {
throw new Error("This should never happen.", e);
}

View File

@@ -66,12 +66,12 @@ public class DefineShape3Tag extends ShapeTag {
@Override
public void getNeededCharacters(Set<Integer> needed) {
shapes.getNeededCharacters(needed);
getShapes().getNeededCharacters(needed);
}
@Override
public boolean removeCharacter(int characterId) {
boolean modified = shapes.removeCharacter(characterId);
boolean modified = getShapes().removeCharacter(characterId);
if (modified) {
setModified(true);
}
@@ -124,7 +124,7 @@ public class DefineShape3Tag extends ShapeTag {
try {
sos.writeUI16(shapeId);
sos.writeRECT(shapeBounds);
sos.writeSHAPEWITHSTYLE(shapes, 3);
sos.writeSHAPEWITHSTYLE(getShapes(), 3);
} catch (IOException e) {
throw new Error("This should never happen.", e);
}

View File

@@ -74,12 +74,12 @@ public class DefineShape4Tag extends ShapeTag {
@Override
public void getNeededCharacters(Set<Integer> needed) {
shapes.getNeededCharacters(needed);
getShapes().getNeededCharacters(needed);
}
@Override
public boolean removeCharacter(int characterId) {
boolean modified = shapes.removeCharacter(characterId);
boolean modified = getShapes().removeCharacter(characterId);
if (modified) {
setModified(true);
}
@@ -143,7 +143,7 @@ public class DefineShape4Tag extends ShapeTag {
sos.writeUB(1, usesFillWindingRule ? 1 : 0);
sos.writeUB(1, usesNonScalingStrokes ? 1 : 0);
sos.writeUB(1, usesScalingStrokes ? 1 : 0);
sos.writeSHAPEWITHSTYLE(shapes, 4);
sos.writeSHAPEWITHSTYLE(getShapes(), 4);
} catch (IOException e) {
throw new Error("This should never happen.", e);
}

View File

@@ -65,12 +65,12 @@ public class DefineShapeTag extends ShapeTag {
@Override
public void getNeededCharacters(Set<Integer> needed) {
shapes.getNeededCharacters(needed);
getShapes().getNeededCharacters(needed);
}
@Override
public boolean removeCharacter(int characterId) {
boolean modified = shapes.removeCharacter(characterId);
boolean modified = getShapes().removeCharacter(characterId);
if (modified) {
setModified(true);
}
@@ -117,7 +117,7 @@ public class DefineShapeTag extends ShapeTag {
try {
sos.writeUI16(shapeId);
sos.writeRECT(shapeBounds);
sos.writeSHAPEWITHSTYLE(shapes, 1);
sos.writeSHAPEWITHSTYLE(getShapes(), 1);
} catch (IOException e) {
throw new Error("This should never happen.", e);
}