Chore/remove boxing and unboxing

generator/schema2template/src/main/java/schema2template/template/GrammarAdditionsFileHandler.java

@@ -167,7 +167,7 @@ private void readAttributeSettings(Attributes attrs) throws SAXException {
     defaultValueByParentElement.put(elementName, defaultValue);
 
     String repetition = attrs.getValue("repetition");
-    if (repetition != null && repetition.length() > 0 && Boolean.valueOf(repetition)) {
+    if (repetition != null && repetition.length() > 0 && Boolean.parseBoolean(repetition)) {
       mRepetitionAttributeNames.add(attrName);
     }
   }

odfdom/src/main/java/org/odftoolkit/odfdom/changes/Cell.java

@@ -276,7 +276,7 @@ public TableTableCellElement addCellStyleAndContent(
               } else if (oldTimeValue != null) {
                 newValue = MapHelper.timeToDouble(oldTimeValue);
               } else if (oldBooleanValue != null) {
-                newValue = Double.valueOf(oldBooleanValue ? 1 : 0);
+                newValue = (double) (oldBooleanValue ? 1 : 0);
               }
 
               if (newValue != null) {

odfdom/src/main/java/org/odftoolkit/odfdom/changes/JsonOperationConsumer.java

@@ -1740,12 +1740,12 @@ static void format(
             }
             double heightFactor = 1;
             double widthFactor = 1;
-            if (newHeight > 0 && newHeight != gHeight.intValue()) {
-              heightFactor = (double) newHeight / (double) gHeight.intValue();
+            if (newHeight > 0 && newHeight != gHeight) {
+              heightFactor = newHeight / (double) gHeight;
               targetNode.setUserData("groupHeight", newHeight, null);
             }
-            if (newWidth > 0 && newWidth != gWidth.intValue()) {
-              widthFactor = (double) newWidth / (double) gWidth.intValue();
+            if (newWidth > 0 && newWidth != gWidth) {
+              widthFactor = newWidth / (double) gWidth;
               targetNode.setUserData("groupWidth", newHeight, null);
             }
             Node child = targetNode.getFirstChild();
@@ -5335,7 +5335,7 @@ else if (key.equals("underline")) {
       }
       if (noProof != null || language != null) {
         Object newLanguage = language;
-        if ((noProof instanceof Boolean && ((Boolean) noProof).booleanValue())
+        if ((noProof instanceof Boolean && (Boolean) noProof)
             || ((language instanceof String) && ((String) language).equals("none"))) {
           propertiesElement.setFoLanguageAttribute("zxx");
           propertiesElement.setStyleLanguageAsianAttribute("zxx");

odfdom/src/main/java/org/odftoolkit/odfdom/changes/MapHelper.java

@@ -1646,7 +1646,7 @@ private static void extractTabulatorPosition(
 
   // convert xmlschema-2 date to double
   public static Double dateToDouble(Object value) {
-    Double ret = Double.valueOf(0.);
+    Double ret = 0.;
     if (value != null && value instanceof String) {
       // ISO 8601 formatter for date-time without time zone.
       FastDateFormat fdf = DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT;
@@ -1666,7 +1666,7 @@ public static Double dateToDouble(Object value) {
   // convert xmlschema-2 duration to double
 
   public static Double timeToDouble(Object value) {
-    Double ret = Double.valueOf(0.);
+    Double ret = 0.;
     if (value != null && value instanceof String) {
       // PThhHmmMss.sssS
       try {
@@ -2478,7 +2478,7 @@ public static String getMSLangCode(String language, String country) {
     }
     Integer entry = localeToLanguageMap.get(cmpString);
     if (entry != null) {
-      return Integer.toHexString(entry.intValue());
+      return Integer.toHexString(entry);
     }
     return "";
   }

odfdom/src/main/java/org/odftoolkit/odfdom/changes/ShapeProperties.java

@@ -241,14 +241,14 @@ public void addMemberPosSize(Object horiOffset, Object vertOffset, Object width,
       if (mVertOffsetMin == null) {
         mVertOffsetMin = (Integer) vertOffset;
       } else {
-        mVertOffsetMin = Math.min(mVertOffsetMin, ((Integer) vertOffset).intValue());
+        mVertOffsetMin = Math.min(mVertOffsetMin, (Integer) vertOffset);
       }
     }
     if (horiOffset != null) {
       if (mHoriOffsetMin == null) {
         mHoriOffsetMin = (Integer) horiOffset;
       } else {
-        mHoriOffsetMin = Math.min(mHoriOffsetMin, ((Integer) horiOffset).intValue());
+        mHoriOffsetMin = Math.min(mHoriOffsetMin, (Integer) horiOffset);
       }
     }
     if (width != null) {

odfdom/src/main/java/org/odftoolkit/odfdom/doc/OdfPresentationDocument.java

@@ -1002,7 +1002,7 @@ private void insertCollectedStyle(
         Boolean isAppended = styleAppendMap.get(newStyleName);
         // if styleAppendMap contain the newStyleName,
         // means that cloneStyleElement has already been appended
-        if ((isAppended != null) && isAppended.booleanValue() == true) {
+        if ((isAppended != null) && isAppended == true) {
           continue;
         } else {
           styleAppendMap.put(newStyleName, true);

odfdom/src/main/java/org/odftoolkit/odfdom/doc/table/OdfTable.java

@@ -1370,7 +1370,7 @@ public List<OdfTableColumn> insertColumnsBefore(int index, int columnCount) {
 
       TableTableColumnElement newColumnEle =
           (TableTableColumnElement) refColumn.getOdfElement().cloneNode(true);
-      newColumnEle.setTableNumberColumnsRepeatedAttribute(Integer.valueOf(columnCount));
+      newColumnEle.setTableNumberColumnsRepeatedAttribute(columnCount);
       mTableElement.insertBefore(newColumnEle, positionCol.getOdfElement());
 
       for (int i = 0; i < columnCount; i++) {
@@ -1410,7 +1410,7 @@ public List<OdfTableColumn> insertColumnsBefore(int index, int columnCount) {
     } else {
       TableTableColumnElement newColumnEle =
           (TableTableColumnElement) refColumn.getOdfElement().cloneNode(true);
-      newColumnEle.setTableNumberColumnsRepeatedAttribute(Integer.valueOf(columnCount));
+      newColumnEle.setTableNumberColumnsRepeatedAttribute(columnCount);
       mTableElement.insertBefore(newColumnEle, positionCol.getOdfElement());
 
       for (int i = 0; i < columnCount; i++) {
@@ -1944,7 +1944,7 @@ public void setTableName(String tableName) {
    */
   public boolean isProtected() {
     if (mTableElement.getTableProtectedAttribute() != null) {
-      return mTableElement.getTableProtectedAttribute().booleanValue();
+      return mTableElement.getTableProtectedAttribute();
     } else {
       return false;
     }

odfdom/src/main/java/org/odftoolkit/odfdom/doc/table/OdfTableCell.java

@@ -296,7 +296,7 @@ private TableTableRowElement findRowInTableHeaderRows(
         return tr;
       }
       if (m instanceof TableTableRowElement) {
-        result += ((TableTableRowElement) m).getTableNumberRowsRepeatedAttribute().intValue();
+        result += ((TableTableRowElement) m).getTableNumberRowsRepeatedAttribute();
       }
     }
     indexs[0] = result;
@@ -312,7 +312,7 @@ private TableTableRowElement findRowInTableRows(
         return tr;
       }
       if (m instanceof TableTableRowElement) {
-        result += ((TableTableRowElement) m).getTableNumberRowsRepeatedAttribute().intValue();
+        result += ((TableTableRowElement) m).getTableNumberRowsRepeatedAttribute();
       }
     }
     indexs[0] = result;
@@ -359,7 +359,7 @@ private TableTableRowElement findRowInTableRowGroup(
           indexs[0] = result;
           return tr;
         }
-        result += ((TableTableRowElement) m).getTableNumberRowsRepeatedAttribute().intValue();
+        result += ((TableTableRowElement) m).getTableNumberRowsRepeatedAttribute();
       }
     }
     indexs[0] = result;
@@ -411,7 +411,7 @@ public int getColumnIndex() {
       }
       if (n instanceof TableTableCellElementBase) {
         result +=
-            ((TableTableCellElementBase) n).getTableNumberColumnsRepeatedAttribute().intValue();
+          ((TableTableCellElementBase) n).getTableNumberColumnsRepeatedAttribute();
       }
     }
     return result;
@@ -1084,7 +1084,7 @@ int getColumnSpannedNumber() {
     }
     Integer value = ((TableTableCellElement) mCellElement).getTableNumberColumnsSpannedAttribute();
     if (value != null) {
-      return value.intValue();
+      return value;
     }
     return DEFAULT_COLUMN_SPANNED_NUMBER;
   }
@@ -1097,7 +1097,7 @@ int getColumnSpannedNumber() {
   int getColumnsRepeatedNumber() {
     Integer value = mCellElement.getTableNumberColumnsRepeatedAttribute();
     if (value != null) {
-      return value.intValue();
+      return value;
     }
     return DEFAULT_COLUMNS_REPEATED_NUMBER;
   }
@@ -1113,7 +1113,7 @@ int getRowSpannedNumber() {
     }
     Integer value = ((TableTableCellElement) mCellElement).getTableNumberRowsSpannedAttribute();
     if (value != null) {
-      return value.intValue();
+      return value;
     }
     return DEFAULT_ROW_SPANNED_NUMBER;
   }
@@ -1131,7 +1131,7 @@ void setColumnSpannedNumber(int spannedNum) {
     splitRepeatedCells();
     if (mCellElement instanceof TableTableCellElement) {
       ((TableTableCellElement) mCellElement)
-          .setTableNumberColumnsSpannedAttribute(Integer.valueOf(spannedNum));
+          .setTableNumberColumnsSpannedAttribute(spannedNum);
     } else {
       throw new IllegalArgumentException();
     }
@@ -1147,7 +1147,7 @@ void setColumnsRepeatedNumber(int repeatedNum) {
     if (repeatedNum < 1) {
       repeatedNum = DEFAULT_COLUMNS_REPEATED_NUMBER;
     }
-    mCellElement.setTableNumberColumnsRepeatedAttribute(Integer.valueOf(repeatedNum));
+    mCellElement.setTableNumberColumnsRepeatedAttribute(repeatedNum);
   }
 
   /**
@@ -1163,7 +1163,7 @@ void setRowSpannedNumber(int spannedNum) {
     splitRepeatedCells();
     if (mCellElement instanceof TableTableCellElement) {
       ((TableTableCellElement) mCellElement)
-          .setTableNumberRowsSpannedAttribute(Integer.valueOf(spannedNum));
+          .setTableNumberRowsSpannedAttribute(spannedNum);
     } else {
       throw new IllegalArgumentException();
     }
@@ -1278,7 +1278,7 @@ public void setCurrencyFormat(String currencySymbol, String format) {
 
     // set display text
     if (value != null) {
-      setDisplayText(formatCurrency(currencyStyle, value.doubleValue()));
+      setDisplayText(formatCurrency(currencyStyle, value));
     }
   }
 

odfdom/src/main/java/org/odftoolkit/odfdom/doc/table/OdfTableCellRange.java

@@ -177,7 +177,7 @@ else if (rowCount == (mnEndRow - mnStartRow + 1)
         firstCellElement.removeAttributeNS(
             OdfDocumentNamespace.TABLE.getUri(), "number-columns-spanned");
         firstCellElement.setTableNumberRowsSpannedAttribute(
-            Integer.valueOf(mnEndRow - mnStartRow + 1));
+          mnEndRow - mnStartRow + 1);
         firstCellElement.setOfficeValueTypeAttribute(
             OfficeValueTypeAttribute.Value.STRING.toString());
       }
@@ -210,7 +210,7 @@ else if (rowCount == (mnEndRow - mnStartRow + 1)
       }
       List<Long> widthList = getCellRangeWidthList();
       long nCellRangeWidth =
-          widthList.get(widthList.size() - 1).longValue() - widthList.get(0).longValue();
+        widthList.get(widthList.size() - 1) - widthList.get(0);
       maOwnerTable.removeColumnsByIndex(mnStartColumn + 1, mnEndColumn - mnStartColumn);
       OdfTableColumn firstColumn = maOwnerTable.getColumnByIndex(mnStartColumn);
       firstColumn.setWidth(nCellRangeWidth);
@@ -227,7 +227,7 @@ else if (rowCount > (mnEndRow - mnStartRow + 1)
         firstCellElement.removeAttributeNS(
             OdfDocumentNamespace.TABLE.getUri(), "number-rows-spanned");
         firstCellElement.setTableNumberColumnsSpannedAttribute(
-            Integer.valueOf(mnEndColumn - mnStartColumn + 1));
+          mnEndColumn - mnStartColumn + 1);
         firstCellElement.setOfficeValueTypeAttribute(
             OfficeValueTypeAttribute.Value.STRING.toString());
       }
@@ -267,9 +267,9 @@ else if (rowCount > (mnEndRow - mnStartRow + 1)
         TableTableCellElement firstCellElement =
             (TableTableCellElement) (firstCell.getOdfElement());
         firstCellElement.setTableNumberColumnsSpannedAttribute(
-            Integer.valueOf(mnEndColumn - mnStartColumn + 1));
+          mnEndColumn - mnStartColumn + 1);
         firstCellElement.setTableNumberRowsSpannedAttribute(
-            Integer.valueOf(mnEndRow - mnStartRow + 1));
+          mnEndRow - mnStartRow + 1);
         firstCellElement.setOfficeValueTypeAttribute(
             OfficeValueTypeAttribute.Value.STRING.toString());
       }
@@ -293,15 +293,15 @@ else if (rowCount > (mnEndRow - mnStartRow + 1)
               firstCell.appendContentFrom(cellBase);
               cellBase.removeContent();
               // set the table column repeated attribute
-              int repeatedNum = cell.getTableNumberColumnsRepeatedAttribute().intValue();
+              int repeatedNum = cell.getTableNumberColumnsRepeatedAttribute();
               int num = (mnEndColumn - j + 1) - repeatedNum;
               if (num >= 0) {
-                coveredCell.setTableNumberColumnsRepeatedAttribute(Integer.valueOf(repeatedNum));
+                coveredCell.setTableNumberColumnsRepeatedAttribute(repeatedNum);
                 parentRow.getOdfElement().removeChild(cell);
               } else {
                 coveredCell.setTableNumberColumnsRepeatedAttribute(
-                    Integer.valueOf(mnEndColumn - j + 1));
-                cell.setTableNumberColumnsRepeatedAttribute(Integer.valueOf(-num));
+                  mnEndColumn - j + 1);
+                cell.setTableNumberColumnsRepeatedAttribute(-num);
               }
 
             } else if (cellBase.getOdfElement() instanceof TableCoveredTableCellElement) {
@@ -324,20 +324,20 @@ else if (rowCount > (mnEndRow - mnStartRow + 1)
   // the returned value is all measured with "mm" unit
   private List<Long> getCellRangeWidthList() {
     List<Long> list = new ArrayList<Long>();
-    Long length = Long.valueOf(0);
+    Long length = 0L;
     for (int i = 0; i < maOwnerTable.getColumnCount() - 1; i++) {
       OdfTableColumn col = maOwnerTable.getColumnByIndex(i);
       int repeateNum = col.getColumnsRepeatedNumber();
       if (repeateNum == 1) {
         if (isColumnInCellRange(i)) {
           list.add(length);
         }
-        length = Long.valueOf(length.longValue() + col.getWidth());
+        length = length + col.getWidth();
       } else {
         for (int j = 0; j < repeateNum; j++) {
           if (isColumnInCellRange(i + j)) {
             list.add(length);
-            length = Long.valueOf(length.longValue() + col.getWidth());
+            length = length + col.getWidth();
           }
         }
         i += repeateNum - 1;
@@ -378,11 +378,11 @@ List<Long> getVeticalSplitCellRangeWidthList(int splitNum) {
     long unitWidth;
     rtnValues.add(widthArray[0]);
     for (int i = 1; i < widthArray.length; i++) {
-      colWidth = Long.valueOf(widthArray[i].longValue() - widthArray[i - 1].longValue());
-      unitWidth = colWidth.longValue() / splitNum;
+      colWidth = widthArray[i] - widthArray[i - 1];
+      unitWidth = colWidth / splitNum;
       for (int j = 1; j < splitNum; j++) {
-        long eachWidth = unitWidth * j + widthArray[i - 1].longValue();
-        rtnValues.add(Long.valueOf(eachWidth));
+        long eachWidth = unitWidth * j + widthArray[i - 1];
+        rtnValues.add(eachWidth);
       }
       rtnValues.add(widthArray[i]);
     }

odfdom/src/main/java/org/odftoolkit/odfdom/doc/table/OdfTableColumn.java

@@ -228,7 +228,7 @@ private long getRelativeWidth() {
     if (sRelWidth != null) {
       if (sRelWidth.contains("*")) {
         Long value = Long.valueOf(sRelWidth.substring(0, sRelWidth.indexOf("*")));
-        return value.longValue();
+        return value;
       }
     }
     return 0;
@@ -296,7 +296,7 @@ public OdfTableCell getCellByIndex(int index) {
   public OdfTableColumn getPreviousColumn() {
     OdfTable table = getTable();
     // the column has repeated column number > 1
-    if (maColumnElement.getTableNumberColumnsRepeatedAttribute().intValue() > 1) {
+    if (maColumnElement.getTableNumberColumnsRepeatedAttribute() > 1) {
       if (mnRepeatedIndex > 0) {
         return table.getColumnInstance(maColumnElement, mnRepeatedIndex - 1);
       }
@@ -324,9 +324,8 @@ public OdfTableColumn getPreviousColumn() {
           if (aPrevNode instanceof TableTableColumnElement) {
             return table.getColumnInstance(
                 (TableTableColumnElement) aPrevNode,
-                ((TableTableColumnElement) aPrevNode)
-                        .getTableNumberColumnsRepeatedAttribute()
-                        .intValue()
+              ((TableTableColumnElement) aPrevNode)
+                .getTableNumberColumnsRepeatedAttribute()
                     - 1);
           } else if (aPrevNode instanceof TableTableColumnsElement
               || aPrevNode instanceof TableTableHeaderColumnsElement
@@ -337,7 +336,7 @@ public OdfTableColumn getPreviousColumn() {
                     xpath.evaluate("//table:table-column[last()]", aPrevNode, XPathConstants.NODE);
             if (lastCol != null) {
               return table.getColumnInstance(
-                  lastCol, lastCol.getTableNumberColumnsRepeatedAttribute().intValue() - 1);
+                  lastCol, lastCol.getTableNumberColumnsRepeatedAttribute() - 1);
             }
           } else {
             aCurNode = aPrevNode;
@@ -490,15 +489,15 @@ public OdfStyle getDefaultCellStyle() {
   // in order to update mnRepeatedIndex of the each column
   void setColumnsRepeatedNumber(int num) {
     // update the mnRepeatedIndex for the ever repeated column
-    maColumnElement.setTableNumberColumnsRepeatedAttribute(Integer.valueOf(num));
+    maColumnElement.setTableNumberColumnsRepeatedAttribute(num);
   }
 
   int getColumnsRepeatedNumber() {
     Integer count = maColumnElement.getTableNumberColumnsRepeatedAttribute();
     if (count == null) {
       return 1;
     } else {
-      return count.intValue();
+      return count;
     }
   }
 }