Merge pull request #3834 from jacomago/java-5-migrations

Java 5 migrations

Author: jacomago

app/alarm/model/src/test/java/org/phoebus/applications/alarm/AlarmConfigProducerDemo.java

@@ -185,7 +185,7 @@ private void sendConfigHierarchy(final Producer<String, AlarmTreeItem<?>> produc
     }
 
     // Place all keys (alarm tree paths) in the same partition
-    private static final Integer partition = Integer.valueOf(0);
+    private static final Integer partition = 0;
 
     private void sendItemConfig(final Producer<String, AlarmTreeItem<?>> producer,
             final String topic, final AlarmTreeItem<?> item)

app/alarm/model/src/test/java/org/phoebus/applications/alarm/AlarmStateProducerDemo.java

@@ -92,7 +92,7 @@ public void close()
         @SuppressWarnings("resource")
         Producer<String, BasicState> producer = new KafkaProducer<>(props, key_serializer, value_serializer);
         // Place all keys (alarm tree paths) in the same partition
-        Integer partition = Integer.valueOf(0);
+        Integer partition = 0;
 
         while (true)
         {

app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeConfigView.java

@@ -189,7 +189,7 @@ private void startup()
             // expand tree item if is matches item name
             if (tree_config_view.getRoot() != null && itemName != null) {
                 for (TreeItem treeItem : tree_config_view.getRoot().getChildren()) {
-                    if (((AlarmTreeItem) treeItem.getValue()).getName().equals(itemName)) {
+                    if (((AlarmTreeItem<?>) treeItem.getValue()).getName().equals(itemName)) {
                         expandAlarms(treeItem);
                         break;
                     }

app/alarm/ui/src/main/java/org/phoebus/applications/alarm/ui/tree/AlarmTreeView.java

@@ -218,7 +218,7 @@ private void startup()
             // expand tree item if is matches item name
             if (tree_view.getRoot() != null && itemName != null) {
                 for (TreeItem treeItem : tree_view.getRoot().getChildren()) {
-                    if (((AlarmTreeItem) treeItem.getValue()).getName().equals(itemName)) {
+                    if (((AlarmTreeItem<?>) treeItem.getValue()).getName().equals(itemName)) {
                         expandAlarms(treeItem);
                         break;
                     }

app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyNode.java

@@ -153,7 +153,7 @@ public String getDisplayValue()
     private String formatVType(VType value )
     {
         Alarm alarm = Alarm.alarmOf(value);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(FormatOptionHandler.format(value, FormatOption.DEFAULT, -1, true));
         if (!alarm.getSeverity().equals(AlarmSeverity.NONE)) 
         {

app/databrowser-json/src/main/java/org/phoebus/archive/reader/json/internal/JsonVTypeReader.java

@@ -293,8 +293,7 @@ public static VType readValue(
                 // Ensure that we have labels for all indices.
                 int min_value = Integer.MAX_VALUE;
                 int max_value = Integer.MIN_VALUE;
-                for (var i = 0; i < enum_value.size(); ++i) {
-                    final var value = enum_value.get(i);
+                for (final Integer value : enum_value) {
                     min_value = Math.min(min_value, value);
                     max_value = Math.max(max_value, value);
                 }

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ExcelExportJob.java

@@ -313,8 +313,7 @@ private void exportTable(final JobMonitor monitor) throws Exception
             final VType line[] = iter.next();
 
             cell = createTimeCell(row = sheet.createRow(row.getRowNum() + 1), time);
-            for (int i=0; i<line.length; ++i)
-                cell = createValueCells(row, cell.getColumnIndex()+1, line[i]);
+            for (VType vType : line) cell = createValueCells(row, cell.getColumnIndex() + 1, vType);
             ++line_count;
             if ((line_count % PROGRESS_UPDATE_LINES) == 0)
                 monitor.beginTask(MessageFormat.format("Wrote {0} samples", line_count));

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/SpreadsheetExportJob.java

@@ -83,8 +83,7 @@ protected void performExport(final JobMonitor monitor,
             final VType line[] = sheet.next();
             out.print(unixTimeStamp ? time.toEpochMilli() : TimestampFormats.MILLI_FORMAT.format(time));
 
-            for (int i=0; i<line.length; ++i)
-                out.print(Messages.Export_Delimiter + formatter.format(line[i]));
+            for (VType vType : line) out.print(Messages.Export_Delimiter + formatter.format(vType));
             out.println();
             ++line_count;
             if ((line_count % PROGRESS_UPDATE_LINES) == 0)

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/FormulaItem.java

@@ -195,12 +195,11 @@ private void compute()
             while (more_input)
             {   // Find oldest time stamp of all the inputs
                 time = null;
-                for (int i = 0; i < values.length; i++)
-                {
-                    if (values[i] == null)
+                for (VType vType : values) {
+                    if (vType == null)
                         continue;
-                    final Instant sample_time = org.phoebus.core.vtypes.VTypeHelper.getTimestamp(values[i]);
-                    if (time == null  ||  sample_time.compareTo(time) < 0)
+                    final Instant sample_time = org.phoebus.core.vtypes.VTypeHelper.getTimestamp(vType);
+                    if (time == null || sample_time.compareTo(time) < 0)
                         time = sample_time;
                 }
                 if (time == null)

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/AddPVDialog.java

@@ -206,10 +206,10 @@ private Node createContent(final Model model, final int count)
                 Tooltip displayNameTextFieldTooltip = new Tooltip(Messages.TraceDisplayNameTT);
                 displayNameTextField.setTooltip(displayNameTextFieldTooltip);
                 gridPane.add(displayNameTextField, 1, row, 2, 1);
-                nameAndDisplayNames.add(new Pair(name, displayNameTextField));
+                nameAndDisplayNames.add(new Pair<>(name, displayNameTextField));
             }
             else {
-                nameAndDisplayNames.add(new Pair(name, name));
+                nameAndDisplayNames.add(new Pair<>(name, name));
             }
 
             if (! formula)