Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java Tue Dec 4 16:09:53 2018 @@ -47,10 +47,10 @@ public class DescriptorMakeUtil { AnalysisEngineDescription aed = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(in); // set the function to crash, if desired aed.getMetaData().getConfigurationParameterSettings().setParameterValue("default", - "TestAnnotator", Boolean.valueOf(shouldCrash)); + "TestAnnotator", shouldCrash); if (shouldCrash) { aed.getMetaData().getConfigurationParameterSettings().setParameterValue(functionName, - "ErrorCount", Integer.valueOf(errorCount)); + "ErrorCount", errorCount); aed.getMetaData().getConfigurationParameterSettings().setParameterValue(functionName, "Exception", exceptionName); } @@ -84,7 +84,7 @@ public class DescriptorMakeUtil { ccd.getCasConsumerMetaData().getConfigurationParameterSettings().setParameterValue( "ErrorFunction", functionName); ccd.getCasConsumerMetaData().getConfigurationParameterSettings().setParameterValue( - "ErrorCount", Integer.valueOf(errorCount)); + "ErrorCount", errorCount); ccd.getCasConsumerMetaData().getConfigurationParameterSettings().setParameterValue( "ErrorException", exceptionName); } @@ -116,13 +116,13 @@ public class DescriptorMakeUtil { CollectionReaderDescription crd = UIMAFramework.getXMLParser() .parseCollectionReaderDescription(in); crd.getCollectionReaderMetaData().getConfigurationParameterSettings().setParameterValue( - "DocumentCount", Integer.valueOf(documentCount)); + "DocumentCount", documentCount); // set the function to crash, if desired if (shouldCrash) { crd.getCollectionReaderMetaData().getConfigurationParameterSettings().setParameterValue( "ErrorFunction", functionName); crd.getCollectionReaderMetaData().getConfigurationParameterSettings().setParameterValue( - "ErrorCount", Integer.valueOf(errorCount)); + "ErrorCount", errorCount); crd.getCollectionReaderMetaData().getConfigurationParameterSettings().setParameterValue( "ErrorException", exceptionName); }
Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java Tue Dec 4 16:09:53 2018 @@ -104,8 +104,7 @@ public class ErrorTestAnnotator extends String functionName = aGroups[i]; try { String exceptionName = (String) aContext.getConfigParameterValue(aGroups[i], EXCEPTION); - int errorCount = ((Integer) aContext.getConfigParameterValue(aGroups[i], ERROR_COUNT)) - .intValue(); + int errorCount = (Integer) aContext.getConfigParameterValue(aGroups[i], ERROR_COUNT); // add the error object to the corresponding HashMap Entry addError(functionName, new FunctionErrorStore(exceptionName, errorCount, functionName)); } catch (NullPointerException e) { @@ -142,7 +141,7 @@ public class ErrorTestAnnotator extends boolean defaultValue) throws AnnotatorContextException { Boolean v = (Boolean) context.getConfigParameterValue(param); if (v != null) { - return v.booleanValue(); + return v; } return defaultValue; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java Tue Dec 4 16:09:53 2018 @@ -73,7 +73,7 @@ public class ErrorTestCasConsumer extend int errorCountName = 0; String errorExceptionName = "RuntimeException"; if (errorCount != null) { - errorCountName = errorCount.intValue(); + errorCountName = errorCount; } if (errorException != null) { errorExceptionName = errorException; Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java Tue Dec 4 16:09:53 2018 @@ -98,7 +98,7 @@ public class ErrorTestCollectionReader e FUNC_GETNEXT_KEY, FUNC_HASNEXT_KEY }; errorConfig = new HashMap(); logger = getLogger(); - documentCount = (((Integer) getConfigParameterValue(DOCUMENT_COUNT)).intValue()); + documentCount = ((Integer) getConfigParameterValue(DOCUMENT_COUNT)); documentsCounted = 0; String errorFunction = (String) getConfigParameterValue(ERROR_FUNCTION); Integer errorCount = (Integer) getConfigParameterValue(ERROR_COUNT); @@ -107,7 +107,7 @@ public class ErrorTestCollectionReader e int errorCountName = 0; String errorExceptionName = "RuntimeException"; if (errorCount != null) { - errorCountName = errorCount.intValue(); + errorCountName = errorCount; } if (errorException != null) { errorExceptionName = errorException; Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java Tue Dec 4 16:09:53 2018 @@ -49,7 +49,6 @@ import org.apache.uima.analysis_engine.T import org.apache.uima.cas.CAS; import org.apache.uima.cas.Type; import org.apache.uima.cas.TypeSystem; -import org.apache.uima.impl.UIMAFramework_impl; import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.metadata.AllowedValue; import org.apache.uima.resource.metadata.Capability; @@ -320,7 +319,7 @@ public class TypeSection extends Abstrac if (isArrayOrListType(rangeType)) { Boolean mra = fd.getMultipleReferencesAllowed(); fItem.setImage(MULTIPLE_REF_OK_COL, - (null != mra && mra.booleanValue()) ? TAEConfiguratorPlugin + (null != mra && mra) ? TAEConfiguratorPlugin .getImage(TAEConfiguratorPlugin.IMAGE_MREFOK) : TAEConfiguratorPlugin .getImage(TAEConfiguratorPlugin.IMAGE_NOMREF)); } else { @@ -405,7 +404,7 @@ public class TypeSection extends Abstrac if (item.getBounds(MULTIPLE_REF_OK_COL).contains(event.x, event.y) && isArrayOrListType(fd.getRangeTypeName())) { Boolean mra = fd.getMultipleReferencesAllowed(); - setToolTipText(tt, (mra != null && mra.booleanValue()) ? "Multiple References Allowed" + setToolTipText(tt, (mra != null && mra) ? "Multiple References Allowed" : "Multiple References Not Allowed"); } else setToolTipText(tt, fd.getDescription()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java Tue Dec 4 16:09:53 2018 @@ -196,8 +196,8 @@ public class AddCapabilityFeatureDialog if (item.getText(1).equals(checkedIndicator(1)) || item.getText(2).equals(checkedIndicator(2))) { names.add(item.getText(0)); - ins.add(Boolean.valueOf(item.getText(1).equals(checkedIndicator(1)))); - outs.add(Boolean.valueOf(item.getText(2).equals(checkedIndicator(2)))); + ins.add(item.getText(1).equals(checkedIndicator(1))); + outs.add(item.getText(2).equals(checkedIndicator(2))); } } @@ -205,8 +205,8 @@ public class AddCapabilityFeatureDialog inputs = new boolean[features.length]; outputs = new boolean[features.length]; for (int i = 0; i < features.length; i++) { - inputs[i] = ((Boolean) ins.get(i)).booleanValue(); - outputs[i] = ((Boolean) outs.get(i)).booleanValue(); + inputs[i] = (Boolean) ins.get(i); + outputs[i] = (Boolean) outs.get(i); } TableItem item = table.getItem(0); Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java Tue Dec 4 16:09:53 2018 @@ -217,8 +217,8 @@ public class AddCapabilityTypeDialog ext || item.getText(OUTPUT).equals(checkedIndicator(OUTPUT))) { names.add(capabilitySection.getFullyQualifiedName(item.getText(NAMESPACE), item .getText(NAME))); - ins.add(Boolean.valueOf(item.getText(INPUT).equals(checkedIndicator(INPUT)))); - outs.add(Boolean.valueOf(item.getText(OUTPUT).equals(checkedIndicator(OUTPUT)))); + ins.add(item.getText(INPUT).equals(checkedIndicator(INPUT))); + outs.add(item.getText(OUTPUT).equals(checkedIndicator(OUTPUT))); } } @@ -227,8 +227,8 @@ public class AddCapabilityTypeDialog ext outputs = new boolean[types.length]; for (int i = 0; i < types.length; i++) { - inputs[i] = ((Boolean) ins.get(i)).booleanValue(); - outputs[i] = ((Boolean) outs.get(i)).booleanValue(); + inputs[i] = (Boolean) ins.get(i); + outputs[i] = (Boolean) outs.get(i); } } Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java Tue Dec 4 16:09:53 2018 @@ -163,7 +163,7 @@ public class AddFeatureDialog extends Ab featureNameUI.setText(originalFeatureName = existingFd.getName()); featureRangeNameUI.setText(existingFd.getRangeTypeName()); Boolean mra = existingFd.getMultipleReferencesAllowed(); - multiRefUI.select((null == mra) ? 0 : (mra.booleanValue()) ? 2 : 1); + multiRefUI.select((null == mra) ? 0 : (mra) ? 2 : 1); String ert = existingFd.getElementType(); elementRangeNameUI.setText((null == ert) ? "" : ert); Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java Tue Dec 4 16:09:53 2018 @@ -58,13 +58,11 @@ public class JgPluginRunner implements I } }; workspace.run(runnable, null); - return Integer.valueOf(0); + return 0; } catch (Exception exception) { exception.printStackTrace(); } - return Integer.valueOf(1); - + return 1; } - } Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java Tue Dec 4 16:09:53 2018 @@ -460,8 +460,8 @@ public class AnalysisEngineMainTab exten config.setAttribute(LauncherConstants.ATTR_DESCRIPTOR_NAME, descriptorText.getText()); config.setAttribute(LauncherConstants.ATTR_INPUT_NAME, inputText.getText()); - config.setAttribute(LauncherConstants.ATTR_INPUT_RECURSIVELY_NAME, - Boolean.valueOf(recursivelyButton.getSelection())); + config.setAttribute(LauncherConstants.ATTR_INPUT_RECURSIVELY_NAME, + recursivelyButton.getSelection()); String formatName; if (casButton.getSelection()) { @@ -482,7 +482,7 @@ public class AnalysisEngineMainTab exten config.setAttribute(LauncherConstants.ATTR_OUTPUT_FOLDER_NAME, outputFolderText.getText()); config.setAttribute(LauncherConstants.ATTR_OUTPUT_CLEAR_NAME, - Boolean.valueOf(clearFolderButton.getSelection())); + clearFolderButton.getSelection()); } public void setDefaults(ILaunchConfigurationWorkingCopy config) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java Tue Dec 4 16:09:53 2018 @@ -283,7 +283,7 @@ public class RegExAnnotator extends CasA // match found; extract locations of start and end of match // (or of entire containing annotation, if that option is on) int annotStart, annotEnd; - if (mAnnotateEntireContainingAnnotation.booleanValue()) { + if (mAnnotateEntireContainingAnnotation) { annotStart = startPos; annotEnd = endPos; } else { Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java Tue Dec 4 16:09:53 2018 @@ -50,7 +50,7 @@ public class SimpleTextSegmenter extends */ public void initialize(UimaContext aContext) throws ResourceInitializationException { super.initialize(aContext); - mSegmentSize = ((Integer) aContext.getConfigParameterValue("SegmentSize")).intValue(); + mSegmentSize = (Integer) aContext.getConfigParameterValue("SegmentSize"); } /* Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java Tue Dec 4 16:09:53 2018 @@ -300,7 +300,7 @@ public class UimaTypeSystem2Ecore { Map aOptions) { String range = aFeature.getRangeTypeName(); boolean multiRefAllowed = aFeature.getMultipleReferencesAllowed() == null ? false : aFeature - .getMultipleReferencesAllowed().booleanValue(); + .getMultipleReferencesAllowed(); EStructuralFeature efeat; // map primitive types to EAttributes if (CAS.TYPE_NAME_STRING.equals(range)) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java Tue Dec 4 16:09:53 2018 @@ -19,8 +19,6 @@ package org.apache.uima.tutorial.ex4; -import java.util.Iterator; - import org.apache.uima.UimaContext; import org.apache.uima.analysis_component.AnalysisComponent; import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; @@ -49,7 +47,7 @@ public class MeetingAnnotator extends JC public void initialize(UimaContext aContext) throws ResourceInitializationException { super.initialize(aContext); // Get config. parameter value - mWindowSize = ((Integer) aContext.getConfigParameterValue("WindowSize")).intValue(); + mWindowSize = (Integer) aContext.getConfigParameterValue("WindowSize"); } /** Modified: uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java Tue Dec 4 16:09:53 2018 @@ -50,25 +50,25 @@ public class JsonMetaDataObjectTest exte apple1 = new TestFruitObject(); apple1.setAttributeValue("name", "Apple"); apple1.setAttributeValue("color", "red"); - apple1.setAttributeValue("avgWeightLbs", Float.valueOf(0.3F)); - apple1.setAttributeValue("avgCostCents", Integer.valueOf(40)); - apple1.setAttributeValue("citrus", Boolean.valueOf(false)); + apple1.setAttributeValue("avgWeightLbs", 0.3F); + apple1.setAttributeValue("avgCostCents", 40); + apple1.setAttributeValue("citrus", Boolean.FALSE); apple1.setAttributeValue("commonUses", new String[] { "baking", "snack" }); apple2 = new TestFruitObject(); apple2.setAttributeValue("name", "Apple"); apple2.setAttributeValue("color", "red"); - apple2.setAttributeValue("avgWeightLbs", Float.valueOf(0.3F)); - apple2.setAttributeValue("avgCostCents", Integer.valueOf(40)); - apple2.setAttributeValue("citrus", Boolean.valueOf(false)); + apple2.setAttributeValue("avgWeightLbs", 0.3F); + apple2.setAttributeValue("avgCostCents", 40); + apple2.setAttributeValue("citrus", Boolean.FALSE); apple2.setAttributeValue("commonUses", new String[] { "baking", "snack" }); orange = new TestFruitObject(); orange.setAttributeValue("name", "Orange"); orange.setAttributeValue("color", "orange"); - orange.setAttributeValue("avgWeightLbs", Float.valueOf(0.2F)); - orange.setAttributeValue("avgCostCents", Integer.valueOf(50)); - orange.setAttributeValue("citrus", Boolean.valueOf(true)); + orange.setAttributeValue("avgWeightLbs", 0.2F); + orange.setAttributeValue("avgCostCents", 50); + orange.setAttributeValue("citrus", Boolean.TRUE); orange.setAttributeValue("commonUses", new String[] { "snack", "juice" }); // create a fruit bag containing these three objects Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java Tue Dec 4 16:09:53 2018 @@ -132,7 +132,7 @@ public class ConfigField { } else return fieldString; } else if (fieldComponent instanceof JCheckBox) - return Boolean.valueOf(((JCheckBox) fieldComponent).isSelected()); + return ((JCheckBox) fieldComponent).isSelected(); else if (fieldComponent instanceof FileSelector) return ((FileSelector) fieldComponent).getSelected(); else if (fieldComponent instanceof ListSelector) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java Tue Dec 4 16:09:53 2018 @@ -124,7 +124,7 @@ public class MetaDataPanel extends FormP if (type.equals("Boolean")) field = new JCheckBox((String) null, (parameterValue == null) ? false - : ((Boolean) parameterValue).booleanValue()); + : (Boolean) parameterValue); else if (multiValued == false) { if (requiresFileSelector == false) { String stringValue = (parameterValue == null) ? "" : parameterValue.toString(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java Tue Dec 4 16:09:53 2018 @@ -994,7 +994,7 @@ public class MainFrame extends JFrame { HashMap<Object, Action> actionMap = createEditActionMap(); // Cut this.cutAction = actionMap.get(DefaultEditorKit.cutAction); - this.cutAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T)); + this.cutAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_T); this.cutAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK)); this.cutAction.setEnabled(false); @@ -1003,7 +1003,7 @@ public class MainFrame extends JFrame { this.editMenu.add(cutItem); // Copy this.copyAction = actionMap.get(DefaultEditorKit.copyAction); - this.copyAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C)); + this.copyAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_C); this.copyAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK)); this.copyAction.setEnabled(false); @@ -1012,7 +1012,7 @@ public class MainFrame extends JFrame { this.editMenu.add(copyItem); // Paste Action pasteAction = actionMap.get(DefaultEditorKit.pasteAction); - pasteAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P)); + pasteAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_P); pasteAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK)); JMenuItem pasteItem = new JMenuItem(pasteAction); Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java Tue Dec 4 16:09:53 2018 @@ -179,7 +179,7 @@ public class ColorParser { if (tf.equals("true")) { checked = true; } - sme.setChecked(Boolean.valueOf(checked)); + sme.setChecked(checked); } } else { sme.setChecked(Boolean.TRUE);// default to Checked @@ -203,7 +203,7 @@ public class ColorParser { if (tf.equals("true")) { checked = true; } - sme.setHidden(Boolean.valueOf(checked)); + sme.setHidden(checked); } } else { sme.setHidden(Boolean.FALSE); // Default to not hidden Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java Tue Dec 4 16:09:53 2018 @@ -490,8 +490,8 @@ public class StyleMapEditor extends JDia // data[x][StyleConstants.FEATURE_VALUE_COLUMN] = e.getFeatureValue(); data[x][StyleConstants.BG_COLUMN] = e.getBackground(); data[x][StyleConstants.FG_COLUMN] = e.getForeground(); - data[x][StyleConstants.CHECK_COLUMN] = Boolean.valueOf(e.getChecked()); - data[x][StyleConstants.HIDDEN_COLUMN] = Boolean.valueOf(e.getHidden()); + data[x][StyleConstants.CHECK_COLUMN] = e.getChecked(); + data[x][StyleConstants.HIDDEN_COLUMN] = e.getHidden(); } tableModel.set(data); @@ -544,8 +544,8 @@ public class StyleMapEditor extends JDia // data[x][StyleConstants.FEATURE_VALUE_COLUMN] = e.getFeatureValue(); data[x][StyleConstants.BG_COLUMN] = e.getBackground(); data[x][StyleConstants.FG_COLUMN] = e.getForeground(); - data[x][StyleConstants.CHECK_COLUMN] = Boolean.valueOf(e.getChecked()); - data[x][StyleConstants.HIDDEN_COLUMN] = Boolean.valueOf(e.getHidden()); + data[x][StyleConstants.CHECK_COLUMN] = e.getChecked(); + data[x][StyleConstants.HIDDEN_COLUMN] = e.getHidden(); // Calculate adequate column widths: int typeNameWidth = fm.stringWidth(e.getAnnotationTypeName()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java Tue Dec 4 16:09:53 2018 @@ -86,7 +86,7 @@ public class StyleMapEntry { * @param hid the new hidden */ public void setHidden(Boolean hid) { - isHidden = hid.booleanValue(); + isHidden = hid; } /** @@ -104,7 +104,7 @@ public class StyleMapEntry { * @param chk the new checked */ public void setChecked(Boolean chk) { - isChecked = chk.booleanValue(); + isChecked = chk; } /** Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java Tue Dec 4 16:09:53 2018 @@ -47,11 +47,11 @@ public class IntegerField extends JForma super(); NumberFormatter formatter = new NumberFormatter(numberFormat); - formatter.setMinimum(new Integer(min)); - formatter.setMaximum(new Integer(max)); + formatter.setMinimum(min); + formatter.setMaximum(max); formatter.setCommitsOnValidEdit(true); setFormatter(formatter); - setValue(new Integer(initialValue)); + setValue(initialValue); } } Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java Tue Dec 4 16:09:53 2018 @@ -77,10 +77,10 @@ public class SliderField extends JPanel @Override public void stateChanged(ChangeEvent e) { int sliderValue = slider.getValue(); - textField.setValue(new Integer(sliderValue)); + textField.setValue(sliderValue); if (!slider.getValueIsAdjusting()) - textField.setValue(new Integer(sliderValue)); + textField.setValue(sliderValue); else // value is adjusting; just set the text textField.setText(String.valueOf(sliderValue)); @@ -114,7 +114,7 @@ public class SliderField extends JPanel */ public int getValue() { Integer value = (Integer) textField.getValue(); - return value.intValue(); + return value; } /** Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java Tue Dec 4 16:09:53 2018 @@ -167,10 +167,10 @@ public class CasTreeViewer extends JPane tableModel.addRow(new Object[] { featName, strVal }); } else if (CAS.TYPE_NAME_INTEGER.equals(rangeTypeName)) { int intVal = aAnnotation.getIntValue(feat); - tableModel.addRow(new Object[] { featName, new Integer(intVal) }); + tableModel.addRow(new Object[] { featName, intVal}); } else if (CAS.TYPE_NAME_FLOAT.equals(rangeTypeName)) { float floatVal = aAnnotation.getFloatValue(feat); - tableModel.addRow(new Object[] { featName, new Float(floatVal) }); + tableModel.addRow(new Object[] { featName, floatVal}); } else if (CAS.TYPE_NAME_STRING_ARRAY.equals(rangeTypeName)) { StringArrayFS arrayFS = (StringArrayFS) aAnnotation.getFeatureValue(feat); StringBuffer displayVal = new StringBuffer(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java Tue Dec 4 16:09:53 2018 @@ -265,7 +265,7 @@ public class MigrateJCas extends VoidVis return sb; } - private static final Integer INTEGER0 = Integer.valueOf(0); + private static final Integer INTEGER0 = 0; private static int nextContainerId = 0; /****************************************************************** @@ -2129,9 +2129,9 @@ public class MigrateJCas extends VoidVis prevFirst = p.getFirst(); logPrintNl(String.format("\n For: %s", p.getFirst()), bw); } - logPrintNl(String.format(" %5d %s", Integer.valueOf(i), p.getSecond()), bw); + logPrintNl(String.format(" %5d %s", i, p.getSecond()), bw); } else { - logPrintNl(String.format("%5d %-" +max+ "s %s", Integer.valueOf(i), p.getFirst(), p.getSecond()), bw); + logPrintNl(String.format("%5d %-" +max+ "s %s", i, p.getFirst(), p.getSecond()), bw); } i++; }