Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java Mon Dec 3 22:00:02 2018 @@ -97,7 +97,7 @@ public class TestFruitObject extends Met * {@link #listAttributes()}. */ static public Set<NameClassPair> getAttributeSet() { - HashSet<NameClassPair> result = new HashSet<NameClassPair>(); + HashSet<NameClassPair> result = new HashSet<>(); result.add(new NameClassPair("name", String.class.getName())); result.add(new NameClassPair("color", String.class.getName())); result.add(new NameClassPair("avgWeightLbs", Float.class.getName())); @@ -108,7 +108,7 @@ public class TestFruitObject extends Met } static public Set<MetaDataAttr> getMetaDataAttrSet() { - HashSet<MetaDataAttr> result = new HashSet<MetaDataAttr>(); + HashSet<MetaDataAttr> result = new HashSet<>(); try { result.add(new MetaDataAttr( "name",
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java Mon Dec 3 22:00:02 2018 @@ -84,7 +84,7 @@ public class CasCopierTest extends TestC TypeDescription fooType = additionalTypes.addType("test.Foo", "Test Type", "uima.tcas.Annotation"); fooType.addFeature("bar", "Test Feature", "uima.cas.String"); - ArrayList<TypeSystemDescription> destTypeSystems = new ArrayList<TypeSystemDescription>(); + ArrayList<TypeSystemDescription> destTypeSystems = new ArrayList<>(); destTypeSystems.add(additionalTypes); destTypeSystems.add(typeSystem); CAS destCas2 = CasCreationUtils.createCas(destTypeSystems); @@ -150,7 +150,7 @@ public class CasCopierTest extends TestC TypeDescription fooType = additionalTypes.addType("test.Foo", "Test Type", "uima.tcas.Annotation"); fooType.addFeature("bar", "Test Feature", "uima.cas.String"); - ArrayList<TypeSystemDescription> destTypeSystems = new ArrayList<TypeSystemDescription>(); + ArrayList<TypeSystemDescription> destTypeSystems = new ArrayList<>(); destTypeSystems.add(additionalTypes); destTypeSystems.add(typeSystem); CAS destCas2 = CasCreationUtils.createCas(destTypeSystems); @@ -164,7 +164,7 @@ public class CasCopierTest extends TestC "uima.tcas.Annotation"); fooType.addFeature("bar", "Test Feature", "uima.cas.Float"); - ArrayList<TypeSystemDescription> srcTypeSystems = new ArrayList<TypeSystemDescription>(); + ArrayList<TypeSystemDescription> srcTypeSystems = new ArrayList<>(); srcTypeSystems.add(additionalTypes); srcTypeSystems.add(typeSystem); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java Mon Dec 3 22:00:02 2018 @@ -101,7 +101,7 @@ public class CasCreationUtilsTest extend Assert.assertEquals(1, ts2desc.getType("Type1").getFeatures().length); Assert.assertEquals(1, ts2desc.getType("Type2").getFeatures().length); - ArrayList<TypeSystemDescription> tsList = new ArrayList<TypeSystemDescription>(); + ArrayList<TypeSystemDescription> tsList = new ArrayList<>(); tsList.add(ts1desc); tsList.add(ts2desc); Map typesWithMergedFeatures = new HashMap(); @@ -174,7 +174,7 @@ public class CasCreationUtilsTest extend .getFile("CasCreationUtilsTest/" + typeFile))); - List<TypeSystemDescription> tsList = new ArrayList<TypeSystemDescription>(); + List<TypeSystemDescription> tsList = new ArrayList<>(); tsList.add(ts1desc); tsList.add(ts2desc); @@ -202,7 +202,7 @@ public class CasCreationUtilsTest extend new XMLInputSource(JUnitExtension.getFile("CasCreationUtilsTest/SupertypeMergeTest2.xml"))); assertEquals("uima.test.Super", ts2desc.getType("uima.test.Sub").getSupertypeName()); - List<TypeSystemDescription> tsList = new ArrayList<TypeSystemDescription>(); + List<TypeSystemDescription> tsList = new ArrayList<>(); tsList.add(ts1desc); tsList.add(ts2desc); TypeSystemDescription merged = CasCreationUtils.mergeTypeSystems(tsList, UIMAFramework @@ -211,7 +211,7 @@ public class CasCreationUtilsTest extend // try merging in the other order - bug UIMA-826 was an order dependency in the behavior of // this kind of merging - tsList = new ArrayList<TypeSystemDescription>(); + tsList = new ArrayList<>(); tsList.add(ts2desc); tsList.add(ts1desc); merged = CasCreationUtils.mergeTypeSystems(tsList, UIMAFramework @@ -239,7 +239,7 @@ public class CasCreationUtilsTest extend .getFile("CasCreationUtilsTest/AggregateTaeWithImports.xml"); AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription( new XMLInputSource(taeDescriptorWithImport)); - ArrayList<AnalysisEngineDescription> mdList = new ArrayList<AnalysisEngineDescription>(); + ArrayList<AnalysisEngineDescription> mdList = new ArrayList<>(); mdList.add(desc); CAS tcas = CasCreationUtils.createCas(mdList, UIMAFramework .getDefaultPerformanceTuningProperties(), resMgr); @@ -447,7 +447,7 @@ public class CasCreationUtilsTest extend + JUnitExtension.getFile("FsIndexCollectionImplTest/dataPathDir").getAbsolutePath()); // call method - ArrayList<AnalysisEngineDescription> descList = new ArrayList<AnalysisEngineDescription>(); + ArrayList<AnalysisEngineDescription> descList = new ArrayList<>(); descList.add(desc); CAS cas = CasCreationUtils.createCas(descList, UIMAFramework .getDefaultPerformanceTuningProperties(), resMgr); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java Mon Dec 3 22:00:02 2018 @@ -33,7 +33,7 @@ import junit.framework.TestCase; */ public class JSR47Logger_implTest extends TestCase { - private static HashMap<String, Level> logLevels = new HashMap<String, Level>(9); + private static HashMap<String, Level> logLevels = new HashMap<>(9); static { logLevels.put("OFF", Level.OFF); logLevels.put("SEVERE", Level.SEVERE); Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java Mon Dec 3 22:00:02 2018 @@ -50,7 +50,7 @@ public class RunnableApplication { protected Execute exec; /** The environment. */ - protected ArrayList<String> environment = new ArrayList<String>(); + protected ArrayList<String> environment = new ArrayList<>(); /** The arg list. */ protected List argList = new ArrayList(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java Mon Dec 3 22:00:02 2018 @@ -232,7 +232,7 @@ public class MultiPageEditor extends For private TypeSystemDescription mergedTypeSystemDescription = null; /** The merged types adding features. */ - private Map<String, Set<String>> mergedTypesAddingFeatures = new TreeMap<String, Set<String>>(); + private Map<String, Set<String>> mergedTypesAddingFeatures = new TreeMap<>(); /** The imported type system description. */ private TypeSystemDescription importedTypeSystemDescription = null; @@ -376,7 +376,7 @@ public class MultiPageEditor extends For protected XMLEditor sourceTextEditor; /** The m b is inited. */ - private boolean m_bIsInited = false; + private boolean m_bIsInited = false; /** The is bad XML. */ protected boolean isBadXML = true; @@ -385,7 +385,7 @@ public class MultiPageEditor extends For public boolean sourceChanged = true; /** The file dirty. */ - private boolean fileDirty; // can only be set dirty once inited + private boolean fileDirty; // can only be set dirty once inited /** The dirty type name hash. */ private HashSet dirtyTypeNameHash; // for generating .java @@ -781,7 +781,7 @@ public class MultiPageEditor extends For IExtensionPoint point = Platform.getExtensionRegistry() .getExtensionPoint(TAEConfiguratorPlugin.pluginId, EXTENSION_POINT_ID); - externalEditorConfigurations = new ArrayList<IConfigurationElement>(); + externalEditorConfigurations = new ArrayList<>(); // check: Any <extension> tags for our extension-point? if (point != null) { @@ -1464,7 +1464,7 @@ public class MultiPageEditor extends For private String cachedRMclassPath = null; /** The cached R mcl. */ - private SoftReference<UIMAClassLoader> cachedRMcl = new SoftReference<UIMAClassLoader>(null); + private SoftReference<UIMAClassLoader> cachedRMcl = new SoftReference<>(null); /** * Creates the resource manager. @@ -1502,7 +1502,7 @@ public class MultiPageEditor extends For classPath, true); cachedRMclassPath = classPath; - cachedRMcl = new SoftReference<UIMAClassLoader>((UIMAClassLoader) resourceManager.getExtensionClassLoader()); + cachedRMcl = new SoftReference<>((UIMAClassLoader) resourceManager.getExtensionClassLoader()); } // in any case, set the data path @@ -1681,7 +1681,7 @@ public class MultiPageEditor extends For * * @return true, if successful */ - private boolean validateSource() { + private boolean validateSource() { if (!sourceChanged) return true; isBadXML = true; // preset Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java Mon Dec 3 22:00:02 2018 @@ -110,7 +110,7 @@ public abstract class AbstractSectionPar protected final String nameHeader = " Name: "; //$NON-NLS-1$ /** The Constant typeNamesW. */ - protected final static Map<String,String> typeNamesW = new HashMap<String,String>(4); + protected final static Map<String,String> typeNamesW = new HashMap<>(4); static { // map extra spaces to get these to take the same typeNamesW.put("Boolean", "Boolean "); //$NON-NLS-1$ //$NON-NLS-2$ typeNamesW.put("Float", "Float "); //$NON-NLS-1$ //$NON-NLS-2$ Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java Mon Dec 3 22:00:02 2018 @@ -340,7 +340,7 @@ public class MultiResourceSelectionDialo throw new InternalErrorCDE("unhandled CoreException while getting classpaths to populate by-location list", e); } String [] cps = cp.split(PATH_SEPARATOR); - List<CandidateAndSource> candidates = new ArrayList<CandidateAndSource>(100); + List<CandidateAndSource> candidates = new ArrayList<>(100); for (String jarOrDir : cps) { if (jarOrDir.toLowerCase().endsWith(".jar")) { @@ -413,10 +413,10 @@ public class MultiResourceSelectionDialo } /** The saw jar. */ - private static Map<String, Long> sawJar = new TreeMap<String, Long>(); + private static Map<String, Long> sawJar = new TreeMap<>(); /** The cached cs. */ - private static Map<String, List<CandidateAndSource>> cachedCs = new TreeMap<String, List<CandidateAndSource>>(); + private static Map<String, List<CandidateAndSource>> cachedCs = new TreeMap<>(); /** * Adds the jar candidates. @@ -434,7 +434,7 @@ public class MultiResourceSelectionDialo lastModified.longValue() != fileLastModified || null == css) { JarInputStream jarIn; - css = new ArrayList<CandidateAndSource>(); + css = new ArrayList<>(); try { jarIn = new JarInputStream(new BufferedInputStream(new FileInputStream(jarPath))); } catch (FileNotFoundException e) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java Mon Dec 3 22:00:02 2018 @@ -209,7 +209,7 @@ public class PickOverrideKeysAndParmName // Then build a list of all config params in the first group String[] groupNames = cg.getNameArray(); ConfigurationGroup[] dcgs = delegateCpd.getConfigurationGroupDeclarations(groupNames[0]); - ArrayList<ConfigurationParameter> cps = new ArrayList<ConfigurationParameter>(); + ArrayList<ConfigurationParameter> cps = new ArrayList<>(); for (ConfigurationGroup dcg : dcgs) { cps.addAll(Arrays.asList(dcg.getConfigurationParameters())); } @@ -217,7 +217,7 @@ public class PickOverrideKeysAndParmName // Then for each of the other groups keep only those parameters in that group // Quite inefficient as searches for each parameter in turn in the group, but .... !! for (int i = 1; i < groupNames.length; ++i) { - ArrayList<ConfigurationParameter> newCps = new ArrayList<ConfigurationParameter>(); + ArrayList<ConfigurationParameter> newCps = new ArrayList<>(); for (ConfigurationParameter cp : cps) { ConfigurationParameter sameCp = delegateCpd.getConfigurationParameter(groupNames[i], cp.getName()); if (sameCp != null) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java Mon Dec 3 22:00:02 2018 @@ -147,7 +147,7 @@ public class AnalysisEngineLaunchConfigu // The class path already contains the jars which are specified in the Classpath tab - List<String> extendedClasspath = new ArrayList<String>(); + List<String> extendedClasspath = new ArrayList<>(); Collections.addAll(extendedClasspath, super.getClasspath(configuration)); // Normal mode, add the launcher plugin and uima runtime jar to the classpath 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=1848108&r1=1848107&r2=1848108&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 Mon Dec 3 22:00:02 2018 @@ -309,7 +309,7 @@ public class AnalysisEngineMainTab exten String defaultEncoding = Charset.defaultCharset().displayName(); - Set<String> charsets = new HashSet<String>(); + Set<String> charsets = new HashSet<>(); charsets.add("US-ASCII"); charsets.add("ISO-8859-1"); charsets.add("UTF-8"); Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java Mon Dec 3 22:00:02 2018 @@ -112,7 +112,7 @@ public class FileSystemCollectionReader // get list of files in the specified directory, and subdirectories if the // parameter PARAM_SUBDIR is set to True - mFiles = new ArrayList<File>(); + mFiles = new ArrayList<>(); addFilesFromDir(directory); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java Mon Dec 3 22:00:02 2018 @@ -121,7 +121,7 @@ public class AdvancedFixedFlowController // Append new keys as a ParallelStep at end of Sequence // This is just an example of what could be done. // Note that in general, a "Collection" is unordered - mSequence.add(new ParallelStep(new ArrayList<String>(aKeys))); + mSequence.add(new ParallelStep(new ArrayList<>(aKeys))); } /* (non-Javadoc) @@ -135,7 +135,7 @@ public class AdvancedFixedFlowController mSequence.set(i, null); } else if (step instanceof ParallelStep) { - Collection<String> keys = new ArrayList<String>(((ParallelStep)step).getAnalysisEngineKeys()); + Collection<String> keys = new ArrayList<>(((ParallelStep) step).getAnalysisEngineKeys()); keys.removeAll(aKeys); if (keys.isEmpty()) { mSequence.set(i, null); Modified: uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java Mon Dec 3 22:00:02 2018 @@ -474,7 +474,7 @@ public class JsonCasSerializer { private final JsonGenerator jg; - private final Map<String, SerializedString> serializedStrings = new HashMap<String, SerializedString>(); + private final Map<String, SerializedString> serializedStrings = new HashMap<>(); private final Map<String, XmlElementName> usedTypeName2XmlElementName; @@ -508,7 +508,7 @@ public class JsonCasSerializer { jch = (JsonContentHandlerJacksonWrapper) ch; jg = jch.getJsonGenerator(); isWithContext = JsonCasSerializer.this.isWithContext || isWithSubtypes || isWithExpandedTypeNames; - usedTypeName2XmlElementName = new HashMap<String, XmlElementName>(cds.tsi.getNumberOfTypes()); + usedTypeName2XmlElementName = new HashMap<>(cds.tsi.getNumberOfTypes()); } @Override @@ -609,7 +609,7 @@ public class JsonCasSerializer { int i = 0; for (final List<TOP> fss : cds.indexedFSs) { r[i] = (fss == null) ? Collections.EMPTY_LIST : (List<TOP>) ((ArrayList<TOP>)fss).clone(); - Collections.sort(r[i++], cds.sortFssByType); + r[i++].sort(cds.sortFssByType); } return r; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java Mon Dec 3 22:00:02 2018 @@ -55,7 +55,7 @@ public class TestFruitBagObject extends // } static public Set<MetaDataAttr> getMetaDataAttrSet() { - Set<MetaDataAttr> result = new HashSet<MetaDataAttr>(); + Set<MetaDataAttr> result = new HashSet<>(); try { result.add(new MetaDataAttr("fruits", TestFruitBagObject.class.getDeclaredMethod("getFruits"), Modified: uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java Mon Dec 3 22:00:02 2018 @@ -97,7 +97,7 @@ public class TestFruitObject extends Met * {@link #listAttributes()}. */ static public Set<NameClassPair> getAttributeSet() { - HashSet<NameClassPair> result = new HashSet<NameClassPair>(); + HashSet<NameClassPair> result = new HashSet<>(); result.add(new NameClassPair("name", String.class.getName())); result.add(new NameClassPair("color", String.class.getName())); result.add(new NameClassPair("avgWeightLbs", Float.class.getName())); @@ -108,7 +108,7 @@ public class TestFruitObject extends Met } static public Set<MetaDataAttr> getMetaDataAttrSet() { - HashSet<MetaDataAttr> result = new HashSet<MetaDataAttr>(); + HashSet<MetaDataAttr> result = new HashSet<>(); try { result.add(new MetaDataAttr( "name", Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java Mon Dec 3 22:00:02 2018 @@ -240,7 +240,7 @@ public class FSNode extends FSTreeNode { // } else { // nodeClass1 = FSNode.STD_FS; // } - List<FSNode> arrayNodes = new ArrayList<FSNode>(arrayLength); + List<FSNode> arrayNodes = new ArrayList<>(arrayLength); SlotKind kind = type.getComponentSlotKind(); int nc = k2nc(kind); switch (kind) { @@ -294,7 +294,7 @@ public class FSNode extends FSTreeNode { this.children = FSTreeModel.createArrayChildren(0, arrayLength, arrayNodes, this.fSTreeModel); } else { - this.children = new ArrayList<FSTreeNode>(type.getNumberOfFeatures()); + this.children = new ArrayList<>(type.getNumberOfFeatures()); FeatureImpl[] feats = type.getFeatureImpls(); for (FeatureImpl f : feats) { SlotKind kind = f.getSlotKind(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java Mon Dec 3 22:00:02 2018 @@ -51,7 +51,7 @@ public class FSTreeModel implements Tree private CASImpl cas; /** The tree model listeners. */ - private List<TreeModelListener> treeModelListeners = new ArrayList<TreeModelListener>(); + private List<TreeModelListener> treeModelListeners = new ArrayList<>(); /** The fss. */ private List<FSNode> fss; @@ -69,7 +69,7 @@ public class FSTreeModel implements Tree public FSTreeModel() { super(); this.root = new FSNode(this, FSNode.DISPLAY_NODE, null, 0, null); - this.root.setChildren(new ArrayList<FSTreeNode>()); + this.root.setChildren(new ArrayList<>()); } /** @@ -86,7 +86,7 @@ public class FSTreeModel implements Tree this.rootString = "<html><font color=green>" + indexName + "</font> - <font color=blue>" + index.getType().getName() + "</font> [" + size + "]</html>"; this.root = new FSNode(this, FSNode.DISPLAY_NODE, null, 0, null); - this.fss = new ArrayList<FSNode>(); + this.fss = new ArrayList<>(); FSIterator<TOP> it = index.iterator(); int count = 0; for (it.moveToFirst(); it.isValid(); it.moveToNext()) { @@ -308,7 +308,7 @@ int getNodeType(Type type) { * @return the list */ static List<FSTreeNode> createArrayChildren(int start, int end, List<FSNode> array, FSTreeModel model) { - ArrayList<FSTreeNode> kids = new ArrayList<FSTreeNode>(); + ArrayList<FSTreeNode> kids = new ArrayList<>(); final int size = end - start; if (size <= ArrayNode.CUTOFF) { kids.ensureCapacity(size); @@ -352,7 +352,7 @@ int getNodeType(Type type) { * @return the tree path */ public TreePath pathToNode(int fsNum) { - List<FSTreeNode> p = new ArrayList<FSTreeNode>(); + List<FSTreeNode> p = new ArrayList<>(); p.add(this.root); getPathToNode(fsNum, this.root.getChildren(), p); TreePath path = new TreePath(p.toArray()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java Mon Dec 3 22:00:02 2018 @@ -46,7 +46,7 @@ public abstract class FSTreeNode { * Removes the all children. */ void removeAllChildren() { - this.children = new ArrayList<FSTreeNode>(); + this.children = new ArrayList<>(); } /** 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=1848108&r1=1848107&r2=1848108&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 Mon Dec 3 22:00:02 2018 @@ -172,7 +172,7 @@ public class MainFrame extends JFrame { private static final long serialVersionUID = -1357410768440678886L; /** The log levels. */ - public static List<Level> logLevels = new ArrayList<Level>(9); + public static List<Level> logLevels = new ArrayList<>(9); static { logLevels.add(Level.OFF); logLevels.add(Level.SEVERE); @@ -480,7 +480,7 @@ public class MainFrame extends JFrame { public static final String DEFAULT_STYLE_NAME = "defaultStyle"; /** The style map. */ - private Map<String, Style> styleMap = new HashMap<String, Style>(); + private Map<String, Style> styleMap = new HashMap<>(); /** The Constant maxRecentSize. */ // For recently used text and descriptor files. @@ -490,17 +490,17 @@ public class MainFrame extends JFrame { private final RecentFilesList recentTextFiles = new RecentFilesList(maxRecentSize); /** The text file name list. */ - private final List<String> textFileNameList = new ArrayList<String>(); + private final List<String> textFileNameList = new ArrayList<>(); /** The recent desc files. */ private final RecentFilesList recentDescFiles = new RecentFilesList(maxRecentSize); /** The desc file name list. */ - private final List<String> descFileNameList = new ArrayList<String>(); + private final List<String> descFileNameList = new ArrayList<>(); /** The cursor owning components. */ // For cursor handling (busy cursor). Is there a better way? - private List<Component> cursorOwningComponents = new ArrayList<Component>(); + private List<Component> cursorOwningComponents = new ArrayList<>(); /** The cursor cache. */ private List<Cursor> cursorCache = null; @@ -1026,7 +1026,7 @@ public class MainFrame extends JFrame { * @return the hash map */ private HashMap<Object, Action> createEditActionMap() { - HashMap<Object, Action> map = new HashMap<Object, Action>(); + HashMap<Object, Action> map = new HashMap<>(); Action[] ar = this.textArea.getActions(); for (int i = 0; i < ar.length; i++) { Action a = ar[i]; @@ -1190,7 +1190,7 @@ public class MainFrame extends JFrame { */ private final void setWaitCursor() { this.setEnabled(false); - this.cursorCache = new ArrayList<Cursor>(); + this.cursorCache = new ArrayList<>(); for (int i = 0; i < this.cursorOwningComponents.size(); i++) { Component comp = this.cursorOwningComponents.get(i); this.cursorCache.add(comp.getCursor()); @@ -1220,7 +1220,7 @@ public class MainFrame extends JFrame { Map<String, Charset> charsetMap = Charset.availableCharsets(); String sysCodePage = Charset.defaultCharset().name(); - this.codePages = new ArrayList<String>(); + this.codePages = new ArrayList<>(); if (sysCodePage != null) { this.codePages.add(sysCodePage); @@ -1332,7 +1332,7 @@ public class MainFrame extends JFrame { * Creates the languages. */ public void createLanguages() { - this.languages = new ArrayList<String>(); + this.languages = new ArrayList<>(); if (this.languagePrefsList == null) { this.languagePrefsList = defaultLanguages; } @@ -1992,7 +1992,7 @@ public class MainFrame extends JFrame { * @return the annotations at pos */ private ArrayList<FSNode> getAnnotationsAtPos(int pos, List<FSNode> annots) { - ArrayList<FSNode> res = new ArrayList<FSNode>(); + ArrayList<FSNode> res = new ArrayList<>(); FSNode annot; final int max = annots.size(); for (int i = 0; i < max; i++) { @@ -2169,7 +2169,7 @@ public class MainFrame extends JFrame { * @return the list */ private static final List<String> stringToArrayList(String s) { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); if (s.length() > 0) { StringTokenizer tok = new StringTokenizer(s, ","); while (tok.hasMoreTokens()) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java Mon Dec 3 22:00:02 2018 @@ -100,7 +100,7 @@ public abstract class MultiMarkup { */ public static AnnotationExtent[] createAnnotationMarkups(FSIterator it, int textLen, Map<String, Style> styleMap) { - List<AnnotExtent> list = new ArrayList<AnnotExtent>(); + List<AnnotExtent> list = new ArrayList<>(); list.add(new AnnotExtent(0, textLen, 0, null)); AnnotationFS fs; AnnotExtent ext; @@ -205,7 +205,7 @@ public abstract class MultiMarkup { */ public static MarkupExtent[] createMarkupExtents(FSIterator it, int textLen) { - List<Extent> list = new ArrayList<Extent>(); + List<Extent> list = new ArrayList<>(); list.add(new Extent(0, textLen, 0)); AnnotationFS fs; Extent ext; Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/RecentFilesList.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/RecentFilesList.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/RecentFilesList.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/RecentFilesList.java Mon Dec 3 22:00:02 2018 @@ -48,7 +48,7 @@ public class RecentFilesList { */ public RecentFilesList(int maxSize) { super(); - this.list = new ArrayList<File>(); + this.list = new ArrayList<>(); this.max = maxSize; } @@ -121,7 +121,7 @@ public class RecentFilesList { * @return The file list as a list of absolute file names. */ public List<String> toStringList() { - List<String> out = new ArrayList<String>(); + List<String> out = new ArrayList<>(); for (File file : this.list) { out.add(file.getAbsolutePath()); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java Mon Dec 3 22:00:02 2018 @@ -621,9 +621,9 @@ public class AnnotationViewerDialog exte */ public void getColorsForTypesFromFile(CasAnnotationViewer viewer, File aStyleMapFile) { - List<Color> colorList = new ArrayList<Color>(); - List<String> typeList = new ArrayList<String>(); - List<String> notCheckedList = new ArrayList<String>(); + List<Color> colorList = new ArrayList<>(); + List<String> typeList = new ArrayList<>(); + List<String> notCheckedList = new ArrayList<>(); ArrayList hiddenList = new ArrayList(); hiddenList.add("uima.cpm.FileLocation"); Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java Mon Dec 3 22:00:02 2018 @@ -1370,7 +1370,7 @@ public class DocumentAnalyzer extends JF // save AE output types for later use in configuring viewer if (aeSpecifier instanceof AnalysisEngineDescription) { - ArrayList<String> outputTypeList = new ArrayList<String>(); + ArrayList<String> outputTypeList = new ArrayList<>(); Capability[] capabilities = ((AnalysisEngineDescription) aeSpecifier) .getAnalysisEngineMetaData().getCapabilities(); for (int i = 0; i < capabilities.length; i++) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java Mon Dec 3 22:00:02 2018 @@ -175,7 +175,7 @@ public class Jg { } String typeName = type.getName(); List<Feature> fs = type.getFeatures(); - List<Feature> features = new ArrayList<Feature>(fs.size()); + List<Feature> features = new ArrayList<>(fs.size()); // get list of features defined in this type excluding those defined in supertypes for (int i = 0; i < fs.size(); i++) { Feature f = fs.get(i); @@ -334,7 +334,7 @@ public class Jg { private Type tcasAnnotationType; /** The merged types adding features. */ - private Map<String, Set<String>> mergedTypesAddingFeatures = new TreeMap<String, Set<String>>(); // a Map of types and the xml files that were merged to create them + private Map<String, Set<String>> mergedTypesAddingFeatures = new TreeMap<>(); // a Map of types and the xml files that were merged to create them /** The project path dir. */ private String projectPathDir; Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java Mon Dec 3 22:00:02 2018 @@ -202,7 +202,7 @@ public class CasAnnotationViewer extends private boolean useConsistentColors = true; /** The high frequency types. */ - private List<String> highFrequencyTypes = new ArrayList<String>(); + private List<String> highFrequencyTypes = new ArrayList<>(); /** The bold face key words. */ private String[] boldFaceKeyWords = new String[0]; @@ -211,10 +211,10 @@ public class CasAnnotationViewer extends private int[] boldFaceSpans = new int[0]; /** The hidden feature names. */ - private Set<String> hiddenFeatureNames = new HashSet<String>(); + private Set<String> hiddenFeatureNames = new HashSet<>(); /** The hidden type names. */ - private Set<String> hiddenTypeNames = new HashSet<String>(); + private Set<String> hiddenTypeNames = new HashSet<>(); /** The displayed type names. */ private Set<String> displayedTypeNames; @@ -226,16 +226,16 @@ public class CasAnnotationViewer extends private boolean hideUnselectedCheckBoxes; /** The user types. */ - private List<String> userTypes = new ArrayList<String>(); + private List<String> userTypes = new ArrayList<>(); /** The types not checked. */ - private Set<String> typesNotChecked = new HashSet<String>(); + private Set<String> typesNotChecked = new HashSet<>(); /** The type color map. */ - private Map<String, Color> typeColorMap = new HashMap<String, Color>(); + private Map<String, Color> typeColorMap = new HashMap<>(); /** The feature color map. */ - private Map<String, Color> featureColorMap = new HashMap<String, Color>(); + private Map<String, Color> featureColorMap = new HashMap<>(); /** The entity resolver. */ private EntityResolver entityResolver = new DefaultEntityResolver(); @@ -245,10 +245,10 @@ public class CasAnnotationViewer extends /** The type to check box map. */ // GUI components - private Map<Type, JCheckBox> typeToCheckBoxMap = new HashMap<Type, JCheckBox>(); + private Map<Type, JCheckBox> typeToCheckBoxMap = new HashMap<>(); /** The entity to check box map. */ - private Map<Entity, JCheckBox> entityToCheckBoxMap = new HashMap<Entity, JCheckBox>(); + private Map<Entity, JCheckBox> entityToCheckBoxMap = new HashMap<>(); /** The horizontal split pane. */ private JSplitPane horizontalSplitPane; @@ -263,16 +263,16 @@ public class CasAnnotationViewer extends private JScrollPane textScrollPane; /** The type radio button map. */ - private Map<Type, JRadioButton> typeRadioButtonMap = new HashMap<Type, JRadioButton>(); + private Map<Type, JRadioButton> typeRadioButtonMap = new HashMap<>(); /** The feature radio button map. */ - private Map<String, JRadioButton> featureRadioButtonMap = new HashMap<String, JRadioButton>(); + private Map<String, JRadioButton> featureRadioButtonMap = new HashMap<>(); /** The feature value check box map. */ - private Map<String, JCheckBox> featureValueCheckBoxMap = new HashMap<String, JCheckBox>(); + private Map<String, JCheckBox> featureValueCheckBoxMap = new HashMap<>(); /** The feature value color map. */ - private Map<String, Color> featureValueColorMap = new HashMap<String, Color>(); + private Map<String, Color> featureValueColorMap = new HashMap<>(); /** The show hide unselected button. */ private JButton showHideUnselectedButton; @@ -1105,7 +1105,7 @@ public class CasAnnotationViewer extends this.displayedTypeNames = null; } else { if (this.displayedTypeNames == null) { - this.displayedTypeNames = new HashSet<String>(); + this.displayedTypeNames = new HashSet<>(); } if (this.displayedTypeNames.size() > 0) { this.displayedTypeNames.clear(); @@ -1135,7 +1135,7 @@ public class CasAnnotationViewer extends * array of fully-qualified names of types to be initially selected */ public void setInitiallySelectedTypes(String[] aTypeNames) { - this.initiallySelectedTypeNames = new HashSet<String>(); + this.initiallySelectedTypeNames = new HashSet<>(); for (int i = 0; i < aTypeNames.length; i++) { this.initiallySelectedTypeNames.add(aTypeNames[i]); } @@ -1449,8 +1449,8 @@ public class CasAnnotationViewer extends */ public void configureViewForXmlFragmentsQuery(String aQuery, String aTypeNamespace) { // need to parse query and produce type list and keyword list - List<String> typeList = new ArrayList<String>(); - List<String> keywordList = new ArrayList<String>(); + List<String> typeList = new ArrayList<>(); + List<String> keywordList = new ArrayList<>(); String delims = "<>+-*\" \t\n"; StringTokenizer tokenizer = new StringTokenizer(aQuery, delims, true); @@ -1684,8 +1684,8 @@ public class CasAnnotationViewer extends return; } - List<JCheckBox> checkBoxes = new ArrayList<JCheckBox>(this.featureValueCheckBoxMap.values()); - Collections.sort(checkBoxes, new Comparator<JCheckBox>() { + List<JCheckBox> checkBoxes = new ArrayList<>(this.featureValueCheckBoxMap.values()); + checkBoxes.sort(new Comparator<JCheckBox>() { @Override public int compare(JCheckBox arg0, JCheckBox arg1) { return arg0.getText().toLowerCase().compareTo(arg1.getText().toLowerCase()); @@ -1708,8 +1708,8 @@ public class CasAnnotationViewer extends return; } - List<JRadioButton> radioButtons = new ArrayList<JRadioButton>(this.featureRadioButtonMap.values()); - Collections.sort(radioButtons, new Comparator<JRadioButton>() { + List<JRadioButton> radioButtons = new ArrayList<>(this.featureRadioButtonMap.values()); + radioButtons.sort(new Comparator<JRadioButton>() { @Override public int compare(JRadioButton arg0, JRadioButton arg1) { return arg0.getText().toLowerCase().compareTo(arg1.getText().toLowerCase()); @@ -1733,8 +1733,8 @@ public class CasAnnotationViewer extends return; } - Map<String, JRadioButton> radioButtonMap = new HashMap<String, JRadioButton>(); - Set<JRadioButton> radioButtonSet = new HashSet<JRadioButton>(); + Map<String, JRadioButton> radioButtonMap = new HashMap<>(); + Set<JRadioButton> radioButtonSet = new HashSet<>(); for (Type type : this.typeRadioButtonMap.keySet()) { JRadioButton typeRadioButton = this.typeRadioButtonMap.get(type); radioButtonMap.put(type.getName(), typeRadioButton); @@ -1754,8 +1754,8 @@ public class CasAnnotationViewer extends } if (radioButtonSet != null && radioButtonSet.size() > 0) { - List<JRadioButton> remainingRadioButtons = new ArrayList<JRadioButton>(radioButtonSet); - Collections.sort(remainingRadioButtons, new Comparator<JRadioButton>() { + List<JRadioButton> remainingRadioButtons = new ArrayList<>(radioButtonSet); + remainingRadioButtons.sort(new Comparator<JRadioButton>() { @Override public int compare(JRadioButton arg0, JRadioButton arg1) { return arg0.getText().toLowerCase().compareTo(arg1.getText().toLowerCase()); @@ -2011,8 +2011,8 @@ public class CasAnnotationViewer extends return; } - Map<String, JCheckBox> checkBoxMap = new HashMap<String, JCheckBox>(); - Set<JCheckBox> checkBoxSet = new HashSet<JCheckBox>(); + Map<String, JCheckBox> checkBoxMap = new HashMap<>(); + Set<JCheckBox> checkBoxSet = new HashSet<>(); for (Type type : this.typeToCheckBoxMap.keySet()) { JCheckBox typeCheckBox = this.typeToCheckBoxMap.get(type); // If the type check box is already added or not selected but needs @@ -2037,8 +2037,8 @@ public class CasAnnotationViewer extends // If we still have remaining type check boxes that need to be added, // add them in sorted order. if (checkBoxSet != null && checkBoxSet.size() > 0) { - List<JCheckBox> remainingCheckBoxes = new ArrayList<JCheckBox>(checkBoxSet); - Collections.sort(remainingCheckBoxes, new Comparator<JCheckBox>() { + List<JCheckBox> remainingCheckBoxes = new ArrayList<>(checkBoxSet); + remainingCheckBoxes.sort(new Comparator<JCheckBox>() { @Override public int compare(JCheckBox o1, JCheckBox o2) { return o1.getText().toLowerCase().compareTo(o2.getText().toLowerCase()); 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=1848108&r1=1848107&r2=1848108&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 Mon Dec 3 22:00:02 2018 @@ -1444,7 +1444,7 @@ public class MigrateJCas extends VoidVis // // find the list of CommonConverteds - one per each different version // // create it if null List<CommonConverted> commonConverteds = classname2multiSources - .computeIfAbsent(fqcn_slash, k -> new ArrayList<CommonConverted>()); + .computeIfAbsent(fqcn_slash, k -> new ArrayList<>()); // search to see if this instance already in the set // if so, add the path to the set of identicals @@ -1877,12 +1877,7 @@ public class MigrateJCas extends VoidVis private class removeEmptyStmts extends VoidVisitorAdapter<Object> { @Override public void visit(BlockStmt n, Object ignore) { - Iterator<Statement> it = n.getStatements().iterator(); - while (it.hasNext()) { - if (it.next() instanceof EmptyStmt) { - it.remove(); - } - } + n.getStatements().removeIf(statement -> statement instanceof EmptyStmt); super.visit(n, ignore); } @@ -2155,14 +2150,13 @@ public class MigrateJCas extends VoidVis * @param items */ private <T, U> void sortReport2(List<? extends Report2<T, U>> items) { - Collections.sort(items, - (o1, o2) -> { - int r = protectedCompare(o1.getFirst(), o2.getFirst()); - if (r == 0) { - r = protectedCompare(o1.getSecond(), o2.getSecond()); - } - return r; - }); + items.sort((o1, o2) -> { + int r = protectedCompare(o1.getFirst(), o2.getFirst()); + if (r == 0) { + r = protectedCompare(o1.getSecond(), o2.getSecond()); + } + return r; + }); } /**
