try to remove goto
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1893596 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
index 1119c6c..44f1c6c 100644
--- a/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
@@ -40,8 +40,6 @@
String _center = "";
String _right = "";
-// FIXME: replace outer goto. just eww.
-outer:
while (text.length() > 1) {
if (text.charAt(0) != '&') {
// Mimics the behaviour of Excel, which would put it in the center.
@@ -59,7 +57,7 @@
}
_left = text.substring(2, pos);
text = text.substring(pos);
- break;
+ return new String[] { _left, _center, _right, };
case 'C':
if (text.contains("&L")) {
pos = Math.min(pos, text.indexOf("&L"));
@@ -69,7 +67,7 @@
}
_center = text.substring(2, pos);
text = text.substring(pos);
- break;
+ return new String[] { _left, _center, _right, };
case 'R':
if (text.contains("&C")) {
pos = Math.min(pos, text.indexOf("&C"));
@@ -79,14 +77,14 @@
}
_right = text.substring(2, pos);
text = text.substring(pos);
- break;
+ return new String[] { _left, _center, _right, };
default:
// Mimics the behaviour of Excel, which would put it in the center.
_center = text;
- break outer;
+ break;
}
}
- return new String[] { _left, _center, _right, };
+ return null;
}
/**
