Skip to content

Commit

Permalink
bug fix for enclosures
Browse files Browse the repository at this point in the history
  • Loading branch information
@rosmord
rosmord committed Nov 11, 2020
1 parent 19bb617 commit 190bd3f
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion cupAndlex/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>cupAndlex</artifactId>
<description>
Expand Down
2 changes: 1 addition & 1 deletion cupruntime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>cupruntime</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jhotdrawfw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>jhotdrawfw</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jsesh-installer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>JSesh-all</artifactId>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<description>
New JSesh installer builder.
Expand Down
2 changes: 1 addition & 1 deletion jsesh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>jsesh</artifactId>
<packaging>jar</packaging>
Expand Down
1 change: 1 addition & 0 deletions jsesh/src/main/java/jsesh/mdcDisplayer/drawingElements/CartoucheDrawerHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ private AbstractCartoucheDrawer buildDelegate(Cartouche c) {
AbstractCartoucheDrawer delegate = null;
switch (c.getType()) {
case 'f':
case 'F':
delegate = new EnclosureDrawer(drawingSpecifications, currentTextDirection, currentTextOrientation, currentView, g);
break;
case 's':
Expand Down
4 changes: 3 additions & 1 deletion jsesh/src/main/java/jsesh/mdcDisplayer/preferences/CartoucheSizeHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class CartoucheSizeHelper {
* axis. Use the basic sizes values declared in this class.
* @param drawingSpecification the corresponding {@link DrawingSpecification}
* @param type
* the type of cartouche ('c', 's', 'h', 'f')
* the type of cartouche ('c', 's', 'h', 'f' or 'F')
* @param element :
* 0,1,2,3, depending on the type of cartouche.
* @return a size.
Expand Down Expand Up @@ -62,6 +62,7 @@ public static float computeCartouchePartLength(DrawingSpecification drawingSpeci
throw new RuntimeException("bad value for element " + element);
}
break;
case 'F':
case 'f':
if (element != 0) {
result = drawingSpecification.getHwtSmallMargin()
Expand Down Expand Up @@ -89,6 +90,7 @@ public static float computeCartoucheSecondaryLength(DrawingSpecification drawing
case 'h':
result = drawingSpecification.getCartoucheMargin() + drawingSpecification.getCartoucheLineWidth();
break;
case 'F':
case 'f':
result = drawingSpecification.getCartoucheMargin() + drawingSpecification.getCartoucheLineWidth()
+ drawingSpecification.getEnclosureBastionDepth();
Expand Down
2 changes: 1 addition & 1 deletion jseshAppli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>jseshAppli</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jseshDemos/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>jseshDemos</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jseshGlyphs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>jseshGlyphs</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jseshLabels/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<description>
Generic i18n texts, usable by all JSesh components.
Expand Down
2 changes: 1 addition & 1 deletion jseshSearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>jseshSearch</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
<packaging>pom</packaging>
<name>JSesh complete distribution</name>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion prepareJSeshRelease/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>JSesh-all</artifactId>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>prepareJSeshRelease</artifactId>
<description>
Expand Down
2 changes: 1 addition & 1 deletion qenherkhopeshefUtils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>qenherkhopeshefUtils</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion signInfoAppli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.qenherkhopeshef.jsesh</groupId>
<artifactId>JSesh-all</artifactId>
<version>7.5.4</version>
<version>7.5.5</version>
</parent>
<artifactId>signInfoAppli</artifactId>
<packaging>jar</packaging>
Expand Down

0 comments on commit 190bd3f

Please sign in to comment.