diff --git a/app/alarm/datasource/src/main/java/org/phoebus/pv/alarm/AlarmContext.java b/app/alarm/datasource/src/main/java/org/phoebus/pv/alarm/AlarmContext.java index 3c9547876c..da0bcdf41c 100644 --- a/app/alarm/datasource/src/main/java/org/phoebus/pv/alarm/AlarmContext.java +++ b/app/alarm/datasource/src/main/java/org/phoebus/pv/alarm/AlarmContext.java @@ -76,7 +76,7 @@ public static synchronized void registerPV(AlarmPV alarmPV) { if(!pvs.containsKey(alarmPV.getInfo().getCompletePath())) { - pvs.put(alarmPV.getInfo().getCompletePath(), new ArrayList()); + pvs.put(alarmPV.getInfo().getCompletePath(), new ArrayList<>()); } pvs.get(alarmPV.getInfo().getCompletePath()).add(alarmPV); // Check if the alarm client associated with the root is created and running diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogConfigSearchJob.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogConfigSearchJob.java index f9e3d573bc..70b4c7501e 100644 --- a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogConfigSearchJob.java +++ b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogConfigSearchJob.java @@ -80,8 +80,8 @@ public Runnable getRunnable() { List result = objectMapper .readValue(response.body(), - new TypeReference>() { - }); + new TypeReference<>() { + }); if (result.size() >= 1) { alarmMessageHandler.accept(result.get(0)); } else { diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/Channel.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/Channel.java index 658619897a..61f6a8da47 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/Channel.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/Channel.java @@ -39,8 +39,8 @@ public static class Builder { private String name; // optional private String owner; - private Set tags = new HashSet(); - private Set properties = new HashSet(); + private Set tags = new HashSet<>(); + private Set properties = new HashSet<>(); /** * Create a channel builder initialized to a copy of the channel @@ -170,12 +170,12 @@ public Channel build() { public Channel(XmlChannel channel) { this.name = channel.getName(); this.owner = channel.getOwner(); - Map newTags = new HashMap(); + Map newTags = new HashMap<>(); for (XmlTag tag : channel.getTags()) { newTags.put(tag.getName(), new Tag(tag)); } this.tags = Collections.unmodifiableMap(newTags); - Map newProperties = new HashMap(); + Map newProperties = new HashMap<>(); for (XmlProperty property : channel.getProperties()) { newProperties.put(property.getName(), new Property(property)); } @@ -186,12 +186,12 @@ public Channel(XmlChannel channel) { private Channel(Builder builder) { this.name = builder.name; this.owner = builder.owner; - Map newTags = new HashMap(); + Map newTags = new HashMap<>(); for (Tag.Builder tag : builder.tags) { newTags.put(tag.build().getName(), tag.build()); } this.tags = Collections.unmodifiableMap(newTags); - Map newProperties = new HashMap(); + Map newProperties = new HashMap<>(); for (Property.Builder property : builder.properties) { newProperties.put(property.build().getName(), property.build()); } diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderService.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderService.java index 56bcfc7e19..67b1a01cfe 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderService.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderService.java @@ -27,7 +27,7 @@ public class ChannelFinderService { private static final String DEFAULT = "default"; private ChannelFinderService() { - channelFinderClients = new HashMap(); + channelFinderClients = new HashMap<>(); } public static ChannelFinderService getInstance() { diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelQuery.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelQuery.java index f0ada74e7c..a267094755 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelQuery.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelQuery.java @@ -79,7 +79,7 @@ public Result(Exception exception, Collection channels) { // Guarded by this: will keep track whether a query is already running private boolean running = false; - private List listeners = new CopyOnWriteArrayList(); + private List listeners = new CopyOnWriteArrayList<>(); public static class Builder { private String query = null; diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelUtil.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelUtil.java index d1b8f8bdd1..ecb99a1bee 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelUtil.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelUtil.java @@ -34,7 +34,7 @@ private ChannelUtil() { * @return Collection of names of tags */ public static Collection getTagNames(Channel channel) { - Collection tagNames = new HashSet(); + Collection tagNames = new HashSet<>(); for (Tag tag : channel.getTags()) { tagNames.add(tag.getName()); } @@ -50,7 +50,7 @@ public static Collection getTagNames(Channel channel) { * channel in channels */ public static Collection getAllTagNames(Collection channels) { - Collection tagNames = new HashSet(); + Collection tagNames = new HashSet<>(); for (Channel channel : channels) { tagNames.addAll(getTagNames(channel)); } @@ -65,7 +65,7 @@ public static Collection getAllTagNames(Collection channels) { * @return Collection of names of properties */ public static Collection getPropertyNames(Channel channel) { - Collection propertyNames = new HashSet(); + Collection propertyNames = new HashSet<>(); for (Property property : channel.getProperties()) { if (property.getValue() != null) propertyNames.add(property.getName()); @@ -82,7 +82,7 @@ public static Collection getPropertyNames(Channel channel) { * more channel in channels */ public static Collection getPropertyNames(Collection channels) { - Collection propertyNames = new HashSet(); + Collection propertyNames = new HashSet<>(); for (Channel channel : channels) { propertyNames.addAll(getPropertyNames(channel)); } @@ -90,7 +90,7 @@ public static Collection getPropertyNames(Collection channels) } public static Collection getPropValues(Collection channels, String propertyName) { - SortedSet propertyValues = new TreeSet(); + SortedSet propertyValues = new TreeSet<>(); for (Channel channel : channels) { if (channel.getProperty(propertyName) != null && channel.getProperty(propertyName).getValue() != null) propertyValues.add(channel.getProperty(propertyName).getValue()); @@ -107,7 +107,7 @@ public static Collection getPropValues(Collection channels, Str * channels */ public static Collection getChannelNames(Collection channels) { - Collection channelNames = new HashSet(); + Collection channelNames = new HashSet<>(); for (Channel channel : channels) { channelNames.add(channel.getName()); } @@ -126,8 +126,8 @@ public static Collection getChannelNames(Collection channels) { * @return Collection of Channels which contains all properties with propNames */ public static Collection filterbyProperties(Collection channels, Collection propNames) { - Collection result = new ArrayList(); - Collection input = new ArrayList(channels); + Collection result = new ArrayList<>(); + Collection input = new ArrayList<>(channels); for (Channel channel : input) { if (channel.getPropertyNames().containsAll(propNames)) { result.add(channel); @@ -148,8 +148,8 @@ public static Collection filterbyProperties(Collection channel * @return Collections of Channels which have all the tags within tagNames */ public static Collection filterbyTags(Collection channels, Collection tagNames) { - Collection result = new ArrayList(); - Collection input = new ArrayList(channels); + Collection result = new ArrayList<>(); + Collection input = new ArrayList<>(channels); for (Channel channel : input) { if (channel.getTagNames().containsAll(tagNames)) { result.add(channel); @@ -174,8 +174,8 @@ public static Collection filterbyTags(Collection channels, Col */ public static Collection filterbyElements(Collection channels, Collection propNames, Collection tagNames) { - Collection result = new ArrayList(); - Collection input = new ArrayList(channels); + Collection result = new ArrayList<>(); + Collection input = new ArrayList<>(channels); for (Channel channel : input) { if (channel.getPropertyNames().containsAll(propNames) && channel.getTagNames().containsAll(tagNames)) { result.add(channel); @@ -193,7 +193,7 @@ public static Collection filterbyElements(Collection channels, * @return Collection of {@link Channel} built from the channelBuilders */ public static Collection toChannels(Collection channelBuilders) { - Collection channels = new HashSet(); + Collection channels = new HashSet<>(); for (Channel.Builder builder : channelBuilders) { channels.add(builder.build()); } @@ -209,7 +209,7 @@ public static Collection toChannels(Collection channel * @return Collection of {@link Channel} built from the channelBuilders */ public static List toCollectionXmlChannels(Collection channelBuilders) { - List xmlchannels = new ArrayList(); + List xmlchannels = new ArrayList<>(); for (Channel.Builder builder : channelBuilders) { xmlchannels.add(builder.toXml()); } diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlChannel.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlChannel.java index 13ddac69b4..7005883ce2 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlChannel.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlChannel.java @@ -19,8 +19,8 @@ public class XmlChannel { private String name; private String owner; - private List properties = new ArrayList(); - private List tags = new ArrayList(); + private List properties = new ArrayList<>(); + private List tags = new ArrayList<>(); /** Creates a new instance of XmlChannel */ public XmlChannel() { diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlProperty.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlProperty.java index c0fdd3938d..dd7cc6bd8b 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlProperty.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlProperty.java @@ -19,7 +19,7 @@ public class XmlProperty { private String name = null; private String owner = null; private String value = null; - private List channels = new ArrayList(); + private List channels = new ArrayList<>(); /** * Creates a new instance of XmlProperty. diff --git a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlTag.java b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlTag.java index e318a4b396..18087aab84 100644 --- a/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlTag.java +++ b/app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/XmlTag.java @@ -20,7 +20,7 @@ public class XmlTag { private String name = null; private String owner = null; - private List channels = new ArrayList(); + private List channels = new ArrayList<>(); /** * Creates a new instance of XmlTag. diff --git a/app/channel/utility/src/main/java/org/phoebus/channelfinder/autocomplete/CFProposalProvider.java b/app/channel/utility/src/main/java/org/phoebus/channelfinder/autocomplete/CFProposalProvider.java index 25f83da501..3cd035e45a 100644 --- a/app/channel/utility/src/main/java/org/phoebus/channelfinder/autocomplete/CFProposalProvider.java +++ b/app/channel/utility/src/main/java/org/phoebus/channelfinder/autocomplete/CFProposalProvider.java @@ -38,15 +38,15 @@ public CFProposalProvider() { return; } - ConnectionCheckJob.submit(this.client, new BiConsumer() { + ConnectionCheckJob.submit(this.client, new BiConsumer<>() { @Override public void accept(String s, Exception e) { active = false; Throwable cause = e.getCause(); - while (cause != null && ! (cause instanceof ChannelFinderException)) + while (cause != null && !(cause instanceof ChannelFinderException)) cause = cause.getCause(); if (cause != null) - e = (Exception)cause; + e = (Exception) cause; CFProposalProvider.logger.log(Level.INFO, "Failed to create Channel Finder PVProposalProvider", e); } }); @@ -67,7 +67,7 @@ public List lookup(String searchString) { } // TODO this needs the v3.0.2 of channelfinder if (active) { - Map searchMap = new HashMap(); + Map searchMap = new HashMap<>(); searchMap.put("~name", "*" + searchString + "*"); // searchMap.put("~size", "20"); result = client.find(searchMap).stream().limit(20).map((channel) -> { diff --git a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/AddPropertyController.java b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/AddPropertyController.java index ea7bfe6736..c3c69b12a3 100644 --- a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/AddPropertyController.java +++ b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/AddPropertyController.java @@ -38,18 +38,18 @@ public class AddPropertyController { @FXML public void initialize() { - availableProperties.setCellFactory(new Callback, ListCell>(){ + availableProperties.setCellFactory(new Callback<>() { @Override public ListCell call(ListView p) { - ListCell cell = new ListCell(){ + ListCell cell = new ListCell<>() { @Override protected void updateItem(Property property, boolean bln) { super.updateItem(property, bln); if (property != null) { - setText(property.getName() + " ("+property.getOwner()+")"); + setText(property.getName() + " (" + property.getOwner() + ")"); } } diff --git a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTableController.java b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTableController.java index d75dbfe352..86cd29bdc9 100644 --- a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTableController.java +++ b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTableController.java @@ -94,10 +94,10 @@ public void initialize() { tableView.getColumns().clear(); TableColumn nameCol = new TableColumn<>(Messages.ChannelTableNameColumn); - nameCol.setCellValueFactory(new PropertyValueFactory("name")); + nameCol.setCellValueFactory(new PropertyValueFactory<>("name")); TableColumn ownerCol = new TableColumn<>(Messages.ChannelTableOwnerColumn); - ownerCol.setCellValueFactory(new PropertyValueFactory("owner")); + ownerCol.setCellValueFactory(new PropertyValueFactory<>("owner")); tableView.getColumns().addAll(nameCol, ownerCol); if (showActiveCb) { @@ -287,12 +287,12 @@ public void setChannels(Collection channels) { @Override public TableColumn apply(String propName) { TableColumn propCol = new TableColumn<>(propName); - propCol.setCellValueFactory(new Callback, ObservableValue>() { + propCol.setCellValueFactory(new Callback<>() { @Override public ObservableValue call(CellDataFeatures channel) { Property prop = channel.getValue().getProperty(propName); - return new SimpleStringProperty(prop != null ? prop.getValue(): ""); + return new SimpleStringProperty(prop != null ? prop.getValue() : ""); } }); return propCol; @@ -304,7 +304,7 @@ public ObservableValue call(CellDataFeatures channel) { @Override public TableColumn apply(String tagName) { TableColumn tagCol = new TableColumn<>(tagName); - tagCol.setCellValueFactory(new Callback, ObservableValue>() { + tagCol.setCellValueFactory(new Callback<>() { @Override public ObservableValue call(CellDataFeatures channel) { diff --git a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyModel.java b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyModel.java index fb839cbb0e..b5b2840ad0 100644 --- a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyModel.java +++ b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyModel.java @@ -39,11 +39,11 @@ public ChannelTreeByPropertyModel(String query, Collection allChannels, // Filter the channels that would not show up as leaf because they don't // have a value for all properties - this.allChannels = new ArrayList(ChannelUtil.filterbyProperties(allChannels, properties)); + this.allChannels = new ArrayList<>(ChannelUtil.filterbyProperties(allChannels, properties)); this.properties = properties; - this.nodePVs = new ArrayList(); - this.nodePVValues = new HashMap(); + this.nodePVs = new ArrayList<>(); + this.nodePVValues = new HashMap<>(); this.query = query; this.showChannelNames = showChannelNames; diff --git a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyNode.java b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyNode.java index 8c61f88fa2..7f4a4b9c7a 100644 --- a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyNode.java +++ b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeByPropertyNode.java @@ -72,7 +72,7 @@ public ChannelTreeByPropertyNode(ChannelTreeByPropertyModel model, ChannelTreeBy nodeChannels = model.allChannels; } else if (getPropertyName() == null) { // leaf node, channels that match the name - nodeChannels = new ArrayList(); + nodeChannels = new ArrayList<>(); for (Channel channel : parentNode.nodeChannels) { if (this.displayName.equals(channel.getName())) { nodeChannels.add(channel); @@ -92,7 +92,7 @@ public ChannelTreeByPropertyNode(ChannelTreeByPropertyModel model, ChannelTreeBy } } else { // Filter the channels that match the property name - nodeChannels = new ArrayList(); + nodeChannels = new ArrayList<>(); for (Channel channel : parentNode.nodeChannels) { if (this.displayName.equals(channel.getProperty(getPropertyName()).getValue())) { nodeChannels.add(channel); @@ -102,12 +102,12 @@ public ChannelTreeByPropertyNode(ChannelTreeByPropertyModel model, ChannelTreeBy if (depth < model.properties.size()) { // Children will be property values - childrenNames = new ArrayList(ChannelUtil.getPropValues(nodeChannels, model.properties.get(depth))); + childrenNames = new ArrayList<>(ChannelUtil.getPropValues(nodeChannels, model.properties.get(depth))); Collections.sort(childrenNames); } else if (depth == model.properties.size()) { // Children will be channels if (model.isShowChannelNames()) { - childrenNames = new ArrayList(ChannelUtil.getChannelNames(nodeChannels)); + childrenNames = new ArrayList<>(ChannelUtil.getChannelNames(nodeChannels)); Collections.sort(childrenNames); } else { childrenNames = null; @@ -221,7 +221,7 @@ private void includePropertyAndValue(Map map) { } public Map getPropertiesAndValues() { - Map map = new HashMap(); + Map map = new HashMap<>(); includePropertyAndValue(map); return map; } diff --git a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeController.java b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeController.java index 00f3a243ee..4626e861c5 100644 --- a/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeController.java +++ b/app/channel/views/src/main/java/org/phoebus/channel/views/ui/ChannelTreeController.java @@ -77,7 +77,7 @@ public void initialize() { treeTableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); treeTableView.getSelectionModel().selectedItemProperty().addListener((obs, oldSelection, newSelection) -> { if (newSelection != null) { - final List selectedChannels = new ArrayList(); + final List selectedChannels = new ArrayList<>(); treeTableView.getSelectionModel().getSelectedItems().stream().forEach(item -> { selectedChannels.addAll(item.getValue().getNodeChannels()); }); diff --git a/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTableDemo.java b/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTableDemo.java index f37d2ac012..6a9fabd897 100644 --- a/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTableDemo.java +++ b/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTableDemo.java @@ -41,7 +41,7 @@ private List testChannels() throws IOException { final ObjectMapper mapper = new ObjectMapper(); try { - List xmlChannels = mapper.readValue(this.getClass().getClassLoader().getResource("testChannels.json"), new TypeReference>() { + List xmlChannels = mapper.readValue(this.getClass().getClassLoader().getResource("testChannels.json"), new TypeReference<>() { }); for (XmlChannel xmlchannel : xmlChannels) { channels.add(new Channel(xmlchannel)); diff --git a/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTreeDemo.java b/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTreeDemo.java index 133b3fbb38..08a7555b35 100644 --- a/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTreeDemo.java +++ b/app/channel/views/src/test/java/org/phoebus/channel/views/ui/ChannelTreeDemo.java @@ -42,7 +42,7 @@ private List testChannels() throws IOException { final ObjectMapper mapper = new ObjectMapper(); try { - List xmlChannels = mapper.readValue(this.getClass().getClassLoader().getResource("testChannels.json"), new TypeReference>() { + List xmlChannels = mapper.readValue(this.getClass().getClassLoader().getResource("testChannels.json"), new TypeReference<>() { }); for (XmlChannel xmlchannel : xmlChannels) { channels.add(new Channel(xmlchannel)); diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ExportJob.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ExportJob.java index 2806c8a576..154b9879f8 100644 --- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ExportJob.java +++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/export/ExportJob.java @@ -49,7 +49,7 @@ abstract public class ExportJob implements JobRunnable final protected String filename; final protected Consumer error_handler; /** Active readers, used to cancel and close them */ - final private CopyOnWriteArrayList archive_readers = new CopyOnWriteArrayList(); + final private CopyOnWriteArrayList archive_readers = new CopyOnWriteArrayList<>(); final protected boolean unixTimeStamp; /** Thread that polls a progress monitor and cancels active archive readers diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/LiveSamples.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/LiveSamples.java index ad1f07213d..de7044bdc3 100644 --- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/LiveSamples.java +++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/LiveSamples.java @@ -24,7 +24,7 @@ public class LiveSamples extends PlotSamples // No locking in here, all access is via PVSamples private RingBuffer samples = - new RingBuffer(Preferences.live_buffer_size); + new RingBuffer<>(Preferences.live_buffer_size); /** Waveform index */ final private AtomicInteger waveform_index; diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/plot/ModelBasedPlot.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/plot/ModelBasedPlot.java index 7e974e9ab4..1bd6a0a33b 100644 --- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/plot/ModelBasedPlot.java +++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/plot/ModelBasedPlot.java @@ -94,81 +94,70 @@ public ModelBasedPlot(final boolean active) value_axis.setName(Messages.Plot_ValueAxisName); // Forward user changes to plot to model - plot.addListener(new RTPlotListener() - { + plot.addListener(new RTPlotListener<>() { @Override - public void changedXAxis(final Axis x_axis) - { + public void changedXAxis(final Axis x_axis) { final AxisRange range = x_axis.getValueRange(); listener.ifPresent(l -> l.timeAxisChanged(plot.isScrolling(), range.getLow(), range.getHigh())); } @Override - public void changedYAxis(final YAxis y_axis) - { + public void changedYAxis(final YAxis y_axis) { final int index = plot.getYAxes().indexOf(y_axis); final AxisRange range = y_axis.getValueRange(); listener.ifPresent(l -> l.valueAxisChanged(index, range.getLow(), range.getHigh())); } @Override - public void changedAutoScale(final Axis y_axis) - { + public void changedAutoScale(final Axis y_axis) { final int index = plot.getYAxes().indexOf(y_axis); listener.ifPresent(l -> l.autoScaleChanged(index, y_axis.isAutoscale())); } @Override - public void changedGrid(final Axis axis) - { + public void changedGrid(final Axis axis) { final int index = axis == plot.getXAxis() - ? -1 - : plot.getYAxes().indexOf(axis); + ? -1 + : plot.getYAxes().indexOf(axis); listener.ifPresent(l -> l.gridChanged(index, axis.isGridVisible())); } @Override - public void changedLogarithmic(final Axis axis) - { + public void changedLogarithmic(final Axis axis) { final int index = plot.getYAxes().indexOf(axis); - listener.ifPresent(l -> l.logarithmicChanged(index, ((YAxis)axis).isLogarithmic())); + listener.ifPresent(l -> l.logarithmicChanged(index, ((YAxis) axis).isLogarithmic())); } @Override - public void changedAnnotations() - { + public void changedAnnotations() { final List annotations = new ArrayList<>(); final List> traces = new ArrayList<>(); for (Trace trace : plot.getTraces()) traces.add(trace); - for (Annotation annotation : plot.getAnnotations()) - { + for (Annotation annotation : plot.getAnnotations()) { final int item_index = traces.indexOf(annotation.getTrace()); annotations.add(new AnnotationInfo(annotation.isInternal(), - item_index, - annotation.getPosition(), annotation.getValue(), - annotation.getOffset(), annotation.getText())); + item_index, + annotation.getPosition(), annotation.getValue(), + annotation.getOffset(), annotation.getText())); } listener.ifPresent(l -> l.changedAnnotations(annotations)); } @Override - public void changedCursors() - { + public void changedCursors() { for (Trace trace : plot.getTraces()) findModelItem(trace).setSelectedSample(trace.getSelectedSample()); listener.ifPresent(l -> l.selectedSamplesChanged()); } @Override - public void changedToolbar(final boolean visible) - { + public void changedToolbar(final boolean visible) { listener.ifPresent(l -> l.changedToolbar(visible)); } @Override - public void changedLegend(final boolean visible) - { + public void changedLegend(final boolean visible) { listener.ifPresent(l -> l.changedLegend(visible)); } }); diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/smoothview/SmoothView.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/smoothview/SmoothView.java index 2b55e3770d..151fd55bdd 100644 --- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/smoothview/SmoothView.java +++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/smoothview/SmoothView.java @@ -209,7 +209,7 @@ private void createTopRow() { validValueRangeLabel.prefWidthProperty().bind(this.widthProperty().divide(14)); validValueRangeLabel.setPadding(new Insets(5)); - StringConverter converter = new StringConverter() { + StringConverter converter = new StringConverter<>() { private final DoubleStringConverter doubleConverter = new DoubleStringConverter(); @Override diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/waveformoverlapview/WaveformOverlapView.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/waveformoverlapview/WaveformOverlapView.java index 7bf1cc801f..4372b6a4fe 100644 --- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/waveformoverlapview/WaveformOverlapView.java +++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/waveformoverlapview/WaveformOverlapView.java @@ -510,9 +510,7 @@ private void initializePlotArea() { toolbarHandler = (ToolbarHandler) toolbarHandlerField.get(plot); toolbar = toolbarHandler.getToolBar(); configButton = (Button) toolbar.getItems().get(0); - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { + } catch (NoSuchFieldException | IllegalAccessException e) { throw new RuntimeException(e); } // Add scale enable button to toolbar diff --git a/app/diag/src/main/java/org/phoebus/app/diag/ui/DiagController.java b/app/diag/src/main/java/org/phoebus/app/diag/ui/DiagController.java index 21fc5275c0..57eb638a0a 100644 --- a/app/diag/src/main/java/org/phoebus/app/diag/ui/DiagController.java +++ b/app/diag/src/main/java/org/phoebus/app/diag/ui/DiagController.java @@ -46,13 +46,13 @@ public void selectionChanged(Object source, Selection oldValue, Selection newVal public void createContextMenu() { final ContextMenu contextMenu = new ContextMenu(); - contextMenu.setOnShowing(new EventHandler() { + contextMenu.setOnShowing(new EventHandler<>() { @Override public void handle(WindowEvent e) { System.out.println("showing"); } }); - contextMenu.setOnShown(new EventHandler() { + contextMenu.setOnShown(new EventHandler<>() { @Override public void handle(WindowEvent e) { System.out.println("shown"); @@ -60,14 +60,14 @@ public void handle(WindowEvent e) { }); MenuItem item1 = new MenuItem("About"); - item1.setOnAction(new EventHandler() { + item1.setOnAction(new EventHandler<>() { @Override public void handle(ActionEvent e) { System.out.println("About"); } }); MenuItem item2 = new MenuItem("Preferences"); - item2.setOnAction(new EventHandler() { + item2.setOnAction(new EventHandler<>() { @Override public void handle(ActionEvent e) { System.out.println("Preferences"); diff --git a/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/AbstractEdmMultiAttributes.java b/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/AbstractEdmMultiAttributes.java index 26c421c254..f10726c215 100644 --- a/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/AbstractEdmMultiAttributes.java +++ b/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/AbstractEdmMultiAttributes.java @@ -22,7 +22,7 @@ public abstract class AbstractEdmMultiAttributes extends private static Logger log = Logger.getLogger("org.csstudio.opibuilder.converter.parser.EdmColor"); - private LinkedHashMap edmAttrMap = new LinkedHashMap(); + private LinkedHashMap edmAttrMap = new LinkedHashMap<>(); /** * Constructor which parses EdmColor from general EdmAttribute value. diff --git a/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmAttribute.java b/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmAttribute.java index b54f41b1f3..ebadce86d8 100644 --- a/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmAttribute.java +++ b/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmAttribute.java @@ -26,7 +26,7 @@ public class EdmAttribute { private boolean isExistInEDl; private void initDefaultValues() { - values = new Vector(); + values = new Vector<>(); required = true; initialized = false; } diff --git a/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmColor.java b/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmColor.java index 6d08ef5b10..552bf46938 100644 --- a/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmColor.java +++ b/app/display/convert-edm/src/main/java/org/csstudio/opibuilder/converter/model/EdmColor.java @@ -139,7 +139,7 @@ private void parseDynamicColorListDefinition() throws EdmException { throw new EdmException(EdmException.COLOR_FORMAT_ERROR, "Color name is empty", null); } dynamic = true; - ruleMap = new LinkedHashMap(); + ruleMap = new LinkedHashMap<>(); Scanner scanner = null; try { String rule = getValue(2); diff --git a/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ADLWidgetUtils.java b/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ADLWidgetUtils.java index 38e397a068..1567217dfe 100644 --- a/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ADLWidgetUtils.java +++ b/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ADLWidgetUtils.java @@ -51,7 +51,7 @@ else if ( adlWidget.getType().equals("limits")){ } public static Object[] adlWidgetArray2ObjectArray( ArrayList inWidget ){ - ArrayList objectList = new ArrayList(); + ArrayList objectList = new ArrayList<>(); System.out.println("number of widgets in the ADLFile " + inWidget.size()); for ( ADLWidget adlWidget : inWidget){ try { diff --git a/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ParserADL.java b/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ParserADL.java index c764ef411c..2f8cd875ed 100644 --- a/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ParserADL.java +++ b/app/display/convert-medm/src/main/java/org/csstudio/utility/adlparser/fileParser/ParserADL.java @@ -39,11 +39,9 @@ * @since 08.10.2007 */ public final class ParserADL { - - /** - * Default Constructor. - */ - public ParserADL(){} + private ParserADL() { + /* This utility class should not be instantiated */ + } /** * Main method of class ParserADL.
@@ -56,54 +54,49 @@ public static ADLWidget getNextElement(final File file) { int lineNr=0; final ADLWidget root = new ADLWidget(file.getAbsolutePath(),null,lineNr++); FileLine.setFile(file.getAbsolutePath()); - ADLWidget children= root; - BufferedReader buffRead = null; - try { + try (BufferedReader buffRead = new BufferedReader(new FileReader(file))) { + parseADLFromReader(buffRead, root, lineNr); + } catch (final IOException e) { + Logger.getLogger(ParserADL.class.getName()).log(Level.WARNING, "Error closing reader", e); + } + return root; + } - buffRead = new BufferedReader(new FileReader(file)); + private static void parseADLFromReader(BufferedReader buffRead, ADLWidget children, int lineNr) { + try { String line; - int lineNumber=0; - String storeDirtyLine=null; - int lastDirtyLine=0; - while((line = buffRead.readLine()) != null){ + int lineNumber = 0; + String storeDirtyLine = null; + int lastDirtyLine = 0; + while ((line = buffRead.readLine()) != null) { lineNumber++; line = line.trim(); - if(line.length()>0){ - if(line.startsWith("#")){ + if (!line.isEmpty()) { + if (line.startsWith("#")) { // do nothing comment line - }else if(line.contains("{") && !line.contains("textix=")){ //$NON-NLS-1$ - children = new ADLWidget(line,children, lineNr++); - }else if (line.contains("}")&& !line.contains("textix=")){ //$NON-NLS-1$ - if (children.getParent() != null) - { + } else if (line.contains("{") && !line.contains("textix=")) { //$NON-NLS-1$ + children = new ADLWidget(line, children, lineNr++); + } else if (line.contains("}") && !line.contains("textix=")) { //$NON-NLS-1$ + if (children.getParent() != null) { children.getParent().addObject(children); children = children.getParent(); } - }else{ - boolean dirtyLine = (line.length()-line.replaceAll("\"", "").length())%2==1; - if(storeDirtyLine!=null&&dirtyLine && lineNumber==(lastDirtyLine+1)){ + } else { + boolean dirtyLine = (line.length() - line.replace("\"", "").length()) % 2 == 1; + if (storeDirtyLine != null && dirtyLine && lineNumber == (lastDirtyLine + 1)) { line = storeDirtyLine.concat(line); - storeDirtyLine=null; - }else if(dirtyLine){ + storeDirtyLine = null; + } else if (dirtyLine) { storeDirtyLine = line; lastDirtyLine = lineNumber; continue; } - children.addBody(new FileLine(line,lineNumber)); + children.addBody(new FileLine(line, lineNumber)); } } } } catch (final Exception e) { Logger.getLogger(ParserADL.class.getName()).log(Level.WARNING, "ADL Parse error", e); - } finally{ - try { - if(buffRead!=null){ - buffRead.close(); - } - } catch (final IOException e) { - Logger.getLogger(ParserADL.class.getName()).log(Level.WARNING, "Error closing reader", e); - } } - return root; } } diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/SetDisplaySize.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/SetDisplaySize.java index 359e92227d..08512c91d2 100644 --- a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/SetDisplaySize.java +++ b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/SetDisplaySize.java @@ -44,8 +44,8 @@ public SetDisplaySize(final DisplayEditor editor) final Rectangle2D bounds = GeometryTools.getBounds(model.getChildren()); final CompoundUndoableAction resize = new CompoundUndoableAction(getText()); - resize.add(new SetWidgetPropertyAction(model.propWidth(), (int) (2*bounds.getMinX() + bounds.getWidth()))); - resize.add(new SetWidgetPropertyAction(model.propHeight(), (int) (2*bounds.getMinY() + bounds.getHeight()))); + resize.add(new SetWidgetPropertyAction<>(model.propWidth(), (int) (2 * bounds.getMinX() + bounds.getWidth()))); + resize.add(new SetWidgetPropertyAction<>(model.propHeight(), (int) (2 * bounds.getMinY() + bounds.getHeight()))); editor.getUndoableActionManager().execute(resize); }); } diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/palette/Palette.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/palette/Palette.java index e67476da8a..a6042095ce 100644 --- a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/palette/Palette.java +++ b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/palette/Palette.java @@ -93,7 +93,7 @@ public Node create() // Copy the widgets, i.e. the children of each palette_group, // to the userData. // Actual children are now updated based on search by widget name - palette_groups.values().forEach(group -> group.setUserData(new ArrayList(group.getChildren()))); + palette_groups.values().forEach(group -> group.setUserData(new ArrayList<>(group.getChildren()))); final TextField searchField = new ClearingTextField(); searchField.setPromptText(Messages.SearchTextField); diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/RulesDialog.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/RulesDialog.java index 7b22e50db6..eed72ed65c 100644 --- a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/RulesDialog.java +++ b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/RulesDialog.java @@ -119,7 +119,7 @@ public ExprItemString(String bool_exp, String prop_val, UndoableActionManager un internal_prop_val = prop_val; string_prop = CommonWidgetProperties.propText.createProperty(widget, prop_val); field.setValue(PropertyPanelSection. - bindSimplePropertyField(undo, bindings, string_prop, new ArrayList())); + bindSimplePropertyField(undo, bindings, string_prop, new ArrayList<>())); } @Override @@ -151,7 +151,7 @@ public ExprItemValue(String bool_exp, WidgetProperty prop_val, UndoableAction super(bool_exp, prop_val, undo); internal_prop_val = prop_val; field.setValue(PropertyPanelSection. - bindSimplePropertyField(undo, bindings, prop_val, new ArrayList())); + bindSimplePropertyField(undo, bindings, prop_val, new ArrayList<>())); } @Override @@ -675,7 +675,7 @@ private Node createRulesTable () // Create table with editable rule 'name' column final TableColumn name_col = new TableColumn<>(Messages.RulesDialog_ColName); - name_col.setCellValueFactory(new PropertyValueFactory("name")); + name_col.setCellValueFactory(new PropertyValueFactory<>("name")); name_col.setCellFactory(list -> EditCell.createStringEditCell()); @@ -816,7 +816,7 @@ private HBox createExpressionsTable () // Create table with editable rule 'bool expression' column final TableColumn, String> bool_exp_col = new TableColumn<>(Messages.RulesDialog_ColBoolExp); bool_exp_col.setSortable(false); - bool_exp_col.setCellValueFactory(new PropertyValueFactory, String>("boolExp")); + bool_exp_col.setCellValueFactory(new PropertyValueFactory<>("boolExp")); bool_exp_col.setCellFactory(tableColumn -> EditCell.createStringEditCell()); // Create table with editable rule 'value expression' column @@ -835,7 +835,7 @@ private HBox createExpressionsTable () }); val_exp_col.setSortable(false); - val_exp_col.setCellValueFactory(new PropertyValueFactory, Node>("field")); + val_exp_col.setCellValueFactory(new PropertyValueFactory<>("field")); val_exp_col.setCellFactory(tableColumn -> new TableCell<>() { @Override @@ -933,7 +933,7 @@ private HBox createPVsTable() // Create table with editable 'name' column final TableColumn name_col = new TableColumn<>(Messages.ScriptsDialog_ColPV); name_col.setSortable(false); - name_col.setCellValueFactory(new PropertyValueFactory("name")); + name_col.setCellValueFactory(new PropertyValueFactory<>("name")); name_col.setCellFactory(col -> new AutoCompletedTableCell(btn_add_pv)); name_col.setOnEditCommit(event -> { @@ -946,7 +946,7 @@ private HBox createPVsTable() // modifies the Observable Property final TableColumn trigger_col = new TableColumn<>(Messages.ScriptsDialog_ColTrigger); trigger_col.setSortable(false); - trigger_col.setCellValueFactory(new PropertyValueFactory("trigger")); + trigger_col.setCellValueFactory(new PropertyValueFactory<>("trigger")); trigger_col.setCellFactory(CheckBoxTableCell. forTableColumn(trigger_col)); trigger_col.setResizable(false); trigger_col.setMaxWidth(70); diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/WidgetColorPropertyBinding.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/WidgetColorPropertyBinding.java index 89df970843..6bdc083cd6 100644 --- a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/WidgetColorPropertyBinding.java +++ b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/WidgetColorPropertyBinding.java @@ -50,14 +50,14 @@ public class WidgetColorPropertyBinding popover = new WidgetColorPopOver(widget_property, wColor -> { - undo.execute(new SetWidgetPropertyAction(widget_property, wColor)); + undo.execute(new SetWidgetPropertyAction<>(widget_property, wColor)); if (! other.isEmpty()) { final String path = widget_property.getPath(); for (Widget w : other) { final ColorWidgetProperty other_prop = (ColorWidgetProperty) w.getProperty(path); - undo.execute(new SetWidgetPropertyAction(other_prop, wColor)); + undo.execute(new SetWidgetPropertyAction<>(other_prop, wColor)); } } }); diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/BrowserConverter.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/BrowserConverter.java index 72e2f5d96b..f20d44ab01 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/BrowserConverter.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/BrowserConverter.java @@ -359,7 +359,7 @@ public void convert() throws IOException { if (!over.isEmpty()) { if (showConfirmDialog(null, OVERRIDING_MSG + " \n" + over, "Conflict", YES_NO_OPTION) == YES_OPTION) { - List pathList = new ArrayList(); + List pathList = new ArrayList<>(); for (File file : over) { pathList.add(file.toPath()); } diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java index f2b5935c51..477fc8d1f0 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/Converter.java @@ -56,7 +56,7 @@ public class Converter { */ public List listOpiFiles(String folder) { - List extensionsList = new ArrayList(); + List extensionsList = new ArrayList<>(); extensionsList.add(OPI_EXTENSION); return listFiles(folder, extensionsList); } @@ -66,7 +66,7 @@ public List listOpiFiles(String folder) { * @return all bob files contained in a given folder */ public List listBobFiles(String folder) { - List extensionsList = new ArrayList(); + List extensionsList = new ArrayList<>(); extensionsList.add(BOB_EXTENSION); return listFiles(folder, extensionsList); } @@ -76,7 +76,7 @@ public List listBobFiles(String folder) { * @return all script files contained in a given folder */ public List listScriptFiles(String folder) { - List extensionsList = new ArrayList(); + List extensionsList = new ArrayList<>(); extensionsList.add(PYTHON_EXTENSION); extensionsList.add(PY_EXTENSION); extensionsList.add(JAVASCRIPT_EXTENSION); @@ -91,7 +91,7 @@ public List listScriptFiles(String folder) { * @return true if the file is a script file */ public boolean isScriptFile(String fileName) { - List extensionsList = new ArrayList(); + List extensionsList = new ArrayList<>(); extensionsList.add(PYTHON_EXTENSION); extensionsList.add(PY_EXTENSION); extensionsList.add(JAVASCRIPT_EXTENSION); @@ -106,7 +106,7 @@ public boolean isScriptFile(String fileName) { * @return true if the file is a opi file */ public boolean isOpiFile(String fileName) { - List extensionsList = new ArrayList(); + List extensionsList = new ArrayList<>(); extensionsList.add(OPI_EXTENSION); return matchExtensions(fileName, extensionsList); } @@ -118,7 +118,7 @@ public boolean isOpiFile(String fileName) { * @return true if the file is a bob file */ public boolean isBobFile(String fileName) { - List extensionsList = new ArrayList(); + List extensionsList = new ArrayList<>(); extensionsList.add(BOB_EXTENSION); return matchExtensions(fileName, extensionsList); } @@ -147,7 +147,7 @@ public static boolean matchExtensions(String fileName, List extensionsLi * @return all files contained in a given folder and match with given extension */ public List listFiles(String folder, List searchExtension) { - List searchFiles = new ArrayList(); + List searchFiles = new ArrayList<>(); File folderFile = new File(folder); if (folderFile.exists() && folderFile.isDirectory()) { File[] listFiles = folderFile.listFiles(); diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/PositionalXMLReader.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/PositionalXMLReader.java index 282018a555..81f971db8e 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/PositionalXMLReader.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/PositionalXMLReader.java @@ -64,7 +64,7 @@ public static Document readXML(final InputStream stream) throws Exception throw new RuntimeException("Can't create SAX parser / DOM builder.", e); } - final Stack elementStack = new Stack(); + final Stack elementStack = new Stack<>(); final StringBuilder textBuffer = new StringBuilder(); final DefaultHandler handler = new DefaultHandler() { diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/InsetsWidgetProperty.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/InsetsWidgetProperty.java index 2c5b54df0c..469c3eba83 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/InsetsWidgetProperty.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/InsetsWidgetProperty.java @@ -29,30 +29,26 @@ public class InsetsWidgetProperty extends RuntimeWidgetProperty { /** 'insets' with two offsets */ public static final WidgetPropertyDescriptor runtimePropInsets = - new WidgetPropertyDescriptor( - WidgetPropertyCategory.RUNTIME, "insets", Messages.WidgetProperties_Insets) - { - @Override - public WidgetProperty createProperty(final Widget widget, - final int[] default_value) - { - return new InsetsWidgetProperty(widget, default_value); - } - }; + new WidgetPropertyDescriptor<>( + WidgetPropertyCategory.RUNTIME, "insets", Messages.WidgetProperties_Insets) { + @Override + public WidgetProperty createProperty(final Widget widget, + final int[] default_value) { + return new InsetsWidgetProperty(widget, default_value); + } + }; /** 'insets' with four offsets */ public static final WidgetPropertyDescriptor runtimePropExtendedInsets = - new WidgetPropertyDescriptor( - WidgetPropertyCategory.RUNTIME, "insets", Messages.WidgetProperties_Insets) - { - @Override - public WidgetProperty createProperty(final Widget widget, - final int[] default_value) - { - return new InsetsWidgetProperty(widget, default_value, 4); - } - }; + new WidgetPropertyDescriptor<>( + WidgetPropertyCategory.RUNTIME, "insets", Messages.WidgetProperties_Insets) { + @Override + public WidgetProperty createProperty(final Widget widget, + final int[] default_value) { + return new InsetsWidgetProperty(widget, default_value, 4); + } + }; diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/RulesWidgetProperty.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/RulesWidgetProperty.java index 92085bd96f..79be4d3c9b 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/RulesWidgetProperty.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/RulesWidgetProperty.java @@ -44,15 +44,13 @@ public class RulesWidgetProperty extends WidgetProperty> private static final Pattern PVSEV_PATTERN = Pattern.compile("pvSev([0-9]+)"); private static final WidgetPropertyDescriptor miscUnknownPropID = - new WidgetPropertyDescriptor(WidgetPropertyCategory.MISC, - "rule_unknown_propid", "RulesWidgetProperty:miscUnknownPropID", false) - { - @Override - public WidgetProperty createProperty(final Widget widget, final String value) - { - return new StringWidgetProperty(this, widget, value); - } - }; + new WidgetPropertyDescriptor<>(WidgetPropertyCategory.MISC, + "rule_unknown_propid", "RulesWidgetProperty:miscUnknownPropID", false) { + @Override + public WidgetProperty createProperty(final Widget widget, final String value) { + return new StringWidgetProperty(this, widget, value); + } + }; /** @param widget Widget diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/util/NamedDaemonPool.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/util/NamedDaemonPool.java index 616a70afa4..8bf53dbe8d 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/util/NamedDaemonPool.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/util/NamedDaemonPool.java @@ -66,7 +66,7 @@ public static ExecutorService createThreadPool(final String name) // Downside: No way to avoid a gazillion threads. return new ThreadPoolExecutor(0, Integer.MAX_VALUE, 10L, TimeUnit.SECONDS, - new SynchronousQueue(), + new SynchronousQueue<>(), new NamedThreadFactory(name)); } diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/DigitalClockWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/DigitalClockWidget.java index 6a89b0aeba..aef0da8f45 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/DigitalClockWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/DigitalClockWidget.java @@ -137,16 +137,16 @@ public enum LCDFont { } /** Property */ - public static final WidgetPropertyDescriptor propLcdDesign = new WidgetPropertyDescriptor (WidgetPropertyCategory.WIDGET, "lcd_design", Messages.WidgetProperties_LcdDesign) { + public static final WidgetPropertyDescriptor propLcdDesign = new WidgetPropertyDescriptor<>(WidgetPropertyCategory.WIDGET, "lcd_design", Messages.WidgetProperties_LcdDesign) { @Override - public EnumWidgetProperty createProperty ( Widget widget, Design defaultValue ) { + public EnumWidgetProperty createProperty(Widget widget, Design defaultValue) { return new EnumWidgetProperty<>(this, widget, defaultValue); } }; /** Property */ - public static final WidgetPropertyDescriptor propLcdFont = new WidgetPropertyDescriptor(WidgetPropertyCategory.WIDGET, "lcd_font", Messages.WidgetProperties_LcdFont) { + public static final WidgetPropertyDescriptor propLcdFont = new WidgetPropertyDescriptor<>(WidgetPropertyCategory.WIDGET, "lcd_font", Messages.WidgetProperties_LcdFont) { @Override - public EnumWidgetProperty createProperty ( Widget widget, LCDFont defaultValue ) { + public EnumWidgetProperty createProperty(Widget widget, LCDFont defaultValue) { return new EnumWidgetProperty<>(this, widget, defaultValue); } }; diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ScaledSliderWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ScaledSliderWidget.java index bf54291516..9ecfbd7d4c 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ScaledSliderWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ScaledSliderWidget.java @@ -71,16 +71,14 @@ public Widget createWidget() /** Display 'scale_font': Font for scale */ public static final WidgetPropertyDescriptor displayScaleFont = - new WidgetPropertyDescriptor( - WidgetPropertyCategory.DISPLAY, "scale_font", Messages.WidgetProperties_Font) - { - @Override - public WidgetProperty createProperty(final Widget widget, - final WidgetFont font) - { - return new FontWidgetProperty(this, widget, font); - } - }; + new WidgetPropertyDescriptor<>( + WidgetPropertyCategory.DISPLAY, "scale_font", Messages.WidgetProperties_Font) { + @Override + public WidgetProperty createProperty(final Widget widget, + final WidgetFont font) { + return new FontWidgetProperty(this, widget, font); + } + }; /** 'show_scale' property: Show scale for scaled widget. */ public static final WidgetPropertyDescriptor propShowScale = diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TextSymbolWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TextSymbolWidget.java index e8407f9a08..9822b2f4fd 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TextSymbolWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TextSymbolWidget.java @@ -68,7 +68,7 @@ public Widget createWidget ( ) { private static final WidgetPropertyDescriptor propSymbol = newStringPropertyDescriptor (WidgetPropertyCategory.WIDGET, "symbol", Messages.WidgetProperties_Symbol); /** 'items' property: list of items (string properties) for combo box */ - public static final ArrayWidgetProperty.Descriptor > propSymbols = new ArrayWidgetProperty.Descriptor< WidgetProperty >( + public static final ArrayWidgetProperty.Descriptor > propSymbols = new ArrayWidgetProperty.Descriptor<>( WidgetPropertyCategory.WIDGET, "symbols", Messages.WidgetProperties_Symbols, diff --git a/app/display/model/src/test/java/org/csstudio/display/builder/model/CustomWidget.java b/app/display/model/src/test/java/org/csstudio/display/builder/model/CustomWidget.java index e2b24ec0ac..6ddad45ff2 100644 --- a/app/display/model/src/test/java/org/csstudio/display/builder/model/CustomWidget.java +++ b/app/display/model/src/test/java/org/csstudio/display/builder/model/CustomWidget.java @@ -24,26 +24,22 @@ public class CustomWidget extends Widget { /** Property: Category Misc, name "zero_ten", Integer 0..10 */ final public static WidgetPropertyDescriptor propZeroTen = - new WidgetPropertyDescriptor(WidgetPropertyCategory.MISC, - "zero_ten", "Number 0..10", false) - { + new WidgetPropertyDescriptor<>(WidgetPropertyCategory.MISC, + "zero_ten", "Number 0..10", false) { @Override public WidgetProperty createProperty(final Widget widget, - final Integer default_value) - { + final Integer default_value) { return new IntegerWidgetProperty(this, widget, default_value, 0, 10); } }; /** Property: Category Misc, name "zero_ten", Integer 0..10 */ final public static WidgetPropertyDescriptor propQuirk = - new WidgetPropertyDescriptor(WidgetPropertyCategory.WIDGET, - "quirk", "Quirk", false) - { + new WidgetPropertyDescriptor<>(WidgetPropertyCategory.WIDGET, + "quirk", "Quirk", false) { @Override public WidgetProperty createProperty(final Widget widget, - final String default_value) - { + final String default_value) { return new StringWidgetProperty(this, widget, default_value); } }; diff --git a/app/display/navigation/src/main/java/org/phoebus/applications/display/navigation/DisplayNavigationViewController.java b/app/display/navigation/src/main/java/org/phoebus/applications/display/navigation/DisplayNavigationViewController.java index c852dec5f6..7e7ab83269 100644 --- a/app/display/navigation/src/main/java/org/phoebus/applications/display/navigation/DisplayNavigationViewController.java +++ b/app/display/navigation/src/main/java/org/phoebus/applications/display/navigation/DisplayNavigationViewController.java @@ -101,7 +101,7 @@ public void refresh() { // update the list view allLinks = new ProcessOPIAllLinksTask(rootFile); - allLinks.setOnSucceeded(new EventHandler() { + allLinks.setOnSucceeded(new EventHandler<>() { @Override public void handle(WorkerStateEvent event) { listView.setItems(FXCollections.observableArrayList(allLinks.getValue())); diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/MacrosTable.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/MacrosTable.java index 07a771a645..ccf69b7dc5 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/MacrosTable.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/MacrosTable.java @@ -118,14 +118,11 @@ public MacrosTable(final Macros initial_macros) } }); - name_col.setCellValueFactory(new Callback, ObservableValue>() - { + name_col.setCellValueFactory(new Callback<>() { @Override - public ObservableValue call(final CellDataFeatures param) - { + public ObservableValue call(final CellDataFeatures param) { final String name = param.getValue().getName(); - if (name.isEmpty()) - { + if (name.isEmpty()) { return new ReadOnlyStringWrapper(Messages.MacrosTable_NameHint); } return new ReadOnlyStringWrapper(name); @@ -191,11 +188,9 @@ public ObservableValue call(final CellDataFeatures pa } }); - value_col.setCellValueFactory(new Callback, ObservableValue>() - { + value_col.setCellValueFactory(new Callback<>() { @Override - public ObservableValue call(final CellDataFeatures param) - { + public ObservableValue call(final CellDataFeatures param) { final String name = param.getValue().getValue(); if (name.isEmpty()) return new ReadOnlyStringWrapper(Messages.MacrosTable_ValueHint); diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PVTableItem.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PVTableItem.java index 464ec992b1..7f90bf1abe 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PVTableItem.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PVTableItem.java @@ -110,9 +110,9 @@ public void commitEdit ( String newValue ) { TableView table = getTableView(); if (table != null) { TableColumn column = getTableColumn(); - TableColumn.CellEditEvent event = new CellEditEvent(table, - new TablePosition(table, getIndex(), column), - TableColumn.editCommitEvent(), newValue); + TableColumn.CellEditEvent event = new CellEditEvent<>(table, + new TablePosition<>(table, getIndex(), column), + TableColumn.editCommitEvent(), newValue); Event.fireEvent(column, event); } } diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PointsTable.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PointsTable.java index 64d12ba034..aa03bbb17d 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PointsTable.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/PointsTable.java @@ -103,11 +103,9 @@ public Node create() // Create table with editable columns for type Double (supported as Number) final TableColumn x_col = new TableColumn<>(Messages.PointsTable_X); - x_col.setCellValueFactory(new Callback, ObservableValue>() - { + x_col.setCellValueFactory(new Callback<>() { @Override - public ObservableValue call(CellDataFeatures param) - { + public ObservableValue call(CellDataFeatures param) { return new SimpleDoubleProperty(param.getValue().getX()); } }); @@ -119,11 +117,9 @@ public ObservableValue call(CellDataFeatures param) }); final TableColumn y_col = new TableColumn<>(Messages.PointsTable_Y); - y_col.setCellValueFactory(new Callback, ObservableValue>() - { + y_col.setCellValueFactory(new Callback<>() { @Override - public ObservableValue call(CellDataFeatures param) - { + public ObservableValue call(CellDataFeatures param) { return new SimpleDoubleProperty(param.getValue().getY()); } }); diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/ScriptsDialog.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/ScriptsDialog.java index da667e5663..f3a3934236 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/ScriptsDialog.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/ScriptsDialog.java @@ -384,7 +384,7 @@ protected void updateItem(final ImageView item, final boolean empty) // Create table with editable script 'file' column scripts_name_col = new TableColumn<>(Messages.ScriptsDialog_ColScript); - scripts_name_col.setCellValueFactory(new PropertyValueFactory("file")); + scripts_name_col.setCellValueFactory(new PropertyValueFactory<>("file")); scripts_name_col.setCellFactory(list -> EditCell.createStringEditCell()); scripts_name_col.setOnEditCommit(event -> @@ -497,7 +497,7 @@ private Region createPVsTable() // Create table with editable 'name' column pvs_name_col = new TableColumn<>(Messages.ScriptsDialog_ColPV); pvs_name_col.setSortable(false); - pvs_name_col.setCellValueFactory(new PropertyValueFactory("name")); + pvs_name_col.setCellValueFactory(new PropertyValueFactory<>("name")); pvs_name_col.setCellFactory((col) -> new AutoCompletedTableCell(btn_pv_add)); pvs_name_col.setOnEditCommit(event -> { @@ -508,7 +508,7 @@ private Region createPVsTable() pvs_trigger_col = new TableColumn<>(Messages.ScriptsDialog_ColTrigger); pvs_trigger_col.setSortable(false); - pvs_trigger_col.setCellValueFactory(new PropertyValueFactory("trigger")); + pvs_trigger_col.setCellValueFactory(new PropertyValueFactory<>("trigger")); pvs_trigger_col.setCellFactory(CheckBoxTableCell.forTableColumn(pvs_trigger_col)); pvs_trigger_col.setResizable(false); pvs_trigger_col.setMaxWidth(70); diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetFontPopOverController.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetFontPopOverController.java index b654a2adb3..196ad5111e 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetFontPopOverController.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetFontPopOverController.java @@ -266,9 +266,9 @@ public void initialize ( URL location, ResourceBundle resources ) { styles.valueProperty().addListener(( observable, oldValue, newValue ) -> stylesUpdater.accept(newValue)); sizes.setPlaceholder(new Label(Messages.WidgetFontPopOver_Sizes)); - sizes.setConverter(new FormatStringConverter(new DecimalFormat("##0.0#")) { + sizes.setConverter(new FormatStringConverter<>(new DecimalFormat("##0.0#")) { @Override - public Double fromString ( String value ) { + public Double fromString(String value) { return Double.valueOf(((Number) super.fromString(value)).doubleValue()); } }); diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java index b31ff7a606..130b6bbdcb 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/WidgetInfoDialog.java @@ -311,7 +311,7 @@ private void pvListDisplay() { area.setText(area.getText() + pv.getName() + "\n"); }); - EventHandler copying = new EventHandler() { + EventHandler copying = new EventHandler<>() { public void handle(ActionEvent e) { final Clipboard clipboard = Clipboard.getSystemClipboard(); final ClipboardContent content = new ClipboardContent(); @@ -319,7 +319,7 @@ public void handle(ActionEvent e) { clipboard.setContent(content); } }; - EventHandler cancel = new EventHandler() { + EventHandler cancel = new EventHandler<>() { public void handle(ActionEvent e) { stage.close(); } @@ -428,13 +428,13 @@ private Tab createMacros(final Macros orig_macros) { private Tab createPVs(final Collection pvs) { // Use text field to allow users to copy the name, value to clipboard final TableColumn name = new TableColumn<>(Messages.WidgetInfoDialog_Name); - name.setCellValueFactory(new PropertyValueFactory("name")); + name.setCellValueFactory(new PropertyValueFactory<>("name")); final TableColumn state = new TableColumn<>(Messages.WidgetInfoDialog_State); - state.setCellValueFactory(new PropertyValueFactory("state")); + state.setCellValueFactory(new PropertyValueFactory<>("state")); final TableColumn path = new TableColumn<>(Messages.WidgetInfoDialog_Path); - path.setCellValueFactory(new PropertyValueFactory("path")); + path.setCellValueFactory(new PropertyValueFactory<>("path")); final TableColumn value = new TableColumn<>(Messages.WidgetInfoDialog_Value); value.setCellFactory(col -> new AlarmColoredCell()); diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ScaledSliderRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ScaledSliderRepresentation.java index 7217bdc386..26b41158ef 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ScaledSliderRepresentation.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ScaledSliderRepresentation.java @@ -489,7 +489,7 @@ public void updateChanges() String format = model_widget.propScaleFormat().getValue(); if (format.isEmpty()) format = "#.#"; - slider.setLabelFormatter(new FormatStringConverter(new DecimalFormat(format))); + slider.setLabelFormatter(new FormatStringConverter<>(new DecimalFormat(format))); slider.setShowTickLabels(true); slider.setShowTickMarks(model_widget.propShowMinorTicks().getValue()); } diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/SpinnerRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/SpinnerRepresentation.java index 51106c36a0..6575dd7438 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/SpinnerRepresentation.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/SpinnerRepresentation.java @@ -263,17 +263,14 @@ private class TextSpinnerValueFactory extends SpinnerValueFactory setStepIncrement(stepIncrement); setMin(min); setMax(max); - setConverter(new StringConverter() - { + setConverter(new StringConverter<>() { @Override - public String toString(String object) - { + public String toString(String object) { return object; } @Override - public String fromString(String text) - { + public String fromString(String text) { return text; } }); diff --git a/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/javafx/sandbox/WebBrowserDemo.java b/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/javafx/sandbox/WebBrowserDemo.java index 8c630ae5b1..0c1e960e9b 100644 --- a/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/javafx/sandbox/WebBrowserDemo.java +++ b/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/javafx/sandbox/WebBrowserDemo.java @@ -119,7 +119,7 @@ class BrowserWithToolbar extends Browser final Button foreButton = new Button(); final Button stop = new Button(); final Button refresh = new Button(); - final ComboBox addressBar = new ComboBox(); + final ComboBox addressBar = new ComboBox<>(); final Button go = new Button(); Control [] controls = new Control [] {backButton, foreButton, stop, refresh, addressBar, go}; diff --git a/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/test/ExampleModels.java b/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/test/ExampleModels.java index 2b6468b69a..23365b37dd 100644 --- a/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/test/ExampleModels.java +++ b/app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/test/ExampleModels.java @@ -86,14 +86,8 @@ public static DisplayModel createModel() public static void main(String[] args) throws Exception { final DisplayModel model = createModel(); - final ModelWriter writer = new ModelWriter(new FileOutputStream("example.opi")); - try - { + try (ModelWriter writer = new ModelWriter(new FileOutputStream("example.opi"))) { writer.writeModel(model); } - finally - { - writer.close(); - } } } diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/WidgetRuntimeFactory.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/WidgetRuntimeFactory.java index 83722a2504..3dc597ea70 100644 --- a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/WidgetRuntimeFactory.java +++ b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/WidgetRuntimeFactory.java @@ -61,7 +61,7 @@ public WidgetRuntime createRuntime(final MW model_widget final WidgetRuntime runtime; if (runtime_class == null) // Use default runtime - runtime = new WidgetRuntime(); + runtime = new WidgetRuntime<>(); else // Use widget-specific runtime runtime = (WidgetRuntime) runtime_class.get(); diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/DataUtil.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/DataUtil.java index e459089554..a863d12b81 100644 --- a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/DataUtil.java +++ b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/DataUtil.java @@ -77,6 +77,6 @@ public final static double[] toJavaDoubleArray(Object array) */ public final static LinkedHashMap createMacrosInput(boolean include_parent_macros) { - return new LinkedHashMap(); + return new LinkedHashMap<>(); } } diff --git a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/internal/PythonScriptSupport.java b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/internal/PythonScriptSupport.java index 4ffb41aa89..0a2a6686cf 100644 --- a/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/internal/PythonScriptSupport.java +++ b/app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/script/internal/PythonScriptSupport.java @@ -62,7 +62,7 @@ public Future submit(PythonScript script, Widget widget, RuntimePV[] pvs removeScheduleMarker(script); try { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("widget", widget); map.put("pvs", pvs); //put script-related utilities into map diff --git a/app/display/runtime/src/test/java/org/csstudio/display/builder/runtime/test/WidgetRuntimeTest.java b/app/display/runtime/src/test/java/org/csstudio/display/builder/runtime/test/WidgetRuntimeTest.java index 4d52b2fd81..59a7f3db7a 100644 --- a/app/display/runtime/src/test/java/org/csstudio/display/builder/runtime/test/WidgetRuntimeTest.java +++ b/app/display/runtime/src/test/java/org/csstudio/display/builder/runtime/test/WidgetRuntimeTest.java @@ -47,14 +47,14 @@ public void testWriteAction() //Write new value double newValue = 20; - List actionList = new ArrayList(); + List actionList = new ArrayList<>(); ActionInfo writeAction = new WritePVAction("Write value", pv_name, String.valueOf(newValue)); actionList.add(writeAction); ActionInfos actInfos = new ActionInfos(actionList, true); widget.setPropertyValue(CommonWidgetProperties.propActions.getName(), actInfos); //Create Widget Runtime - WidgetRuntime ofWidget = new WidgetRuntime(); + WidgetRuntime ofWidget = new WidgetRuntime<>(); ofWidget.initialize(widget); ofWidget.addPV(pv, true); ofWidget.start(); diff --git a/app/display/thumbwheel/src/main/java/org/csstudio/display/widget/ThumbWheel.java b/app/display/thumbwheel/src/main/java/org/csstudio/display/widget/ThumbWheel.java index 25d74975be..cac477d819 100644 --- a/app/display/thumbwheel/src/main/java/org/csstudio/display/widget/ThumbWheel.java +++ b/app/display/thumbwheel/src/main/java/org/csstudio/display/widget/ThumbWheel.java @@ -136,17 +136,17 @@ protected void setWidgetHeight(Integer new_value) { /* * ---- backgroundColor ---------------------------------------------------- */ - private final ObjectProperty backgroundColor = new SimpleObjectProperty(this, "backgroundColor", Color.LIGHTGRAY) { + private final ObjectProperty backgroundColor = new SimpleObjectProperty<>(this, "backgroundColor", Color.LIGHTGRAY) { @Override protected void invalidated() { - if ( get() == null ) { + if (get() == null) { set(Color.LIGHTGRAY); } else { setStyle(MessageFormat.format( "-se-thumbwheel-inner-background: rgb({0,number,###}, {1,number,###}, {2,number,###});", - (int) ( 255 * getBackgroundColor().getRed() ), - (int) ( 255 * getBackgroundColor().getGreen() ), - (int) ( 255 * getBackgroundColor().getBlue() ) + (int) (255 * getBackgroundColor().getRed()), + (int) (255 * getBackgroundColor().getGreen()), + (int) (255 * getBackgroundColor().getBlue()) )); } } @@ -163,10 +163,10 @@ public void setBackgroundColor( Color backgroundColor ) { /* * ---- decrementButtonsColor ---------------------------------------------- */ - private final ObjectProperty decrementButtonsColor = new SimpleObjectProperty(this, "decrementButtonsColor", DEFAULT_DECREMENT_BUTTON_COLOR) { + private final ObjectProperty decrementButtonsColor = new SimpleObjectProperty<>(this, "decrementButtonsColor", DEFAULT_DECREMENT_BUTTON_COLOR) { @Override protected void invalidated() { - if ( get() == null ) { + if (get() == null) { set(DEFAULT_DECREMENT_BUTTON_COLOR); } else { @@ -208,12 +208,12 @@ public void setDecimalDigits( int decimalDigits ) { /* * ---- foregroundColor ---------------------------------------------------- */ - private final ObjectProperty foregroundColor = new SimpleObjectProperty(this, "foregroundColor", Color.BLACK) { + private final ObjectProperty foregroundColor = new SimpleObjectProperty<>(this, "foregroundColor", Color.BLACK) { @Override protected void invalidated() { - if ( get() == null ) { + if (get() == null) { set(Color.BLACK); - } else if ( !isInvalid() ) { + } else if (!isInvalid()) { changeLabelsColor(get()); } } @@ -230,20 +230,20 @@ public void setForegroundColor( Color foregroundColor ) { /* * ---- font --------------------------------------------------------------- */ - private final ObjectProperty font = new SimpleObjectProperty(this, "font", DEFAULT_FONT) { + private final ObjectProperty font = new SimpleObjectProperty<>(this, "font", DEFAULT_FONT) { @Override protected void invalidated() { - if ( get() == null ) { + if (get() == null) { set(DEFAULT_FONT); } else { Font f = get(); - if ( signLabel != null ) { + if (signLabel != null) { signLabel.setFont(f); } - if ( separatorLabel != null ) { + if (separatorLabel != null) { separatorLabel.setFont(f); } @@ -299,10 +299,10 @@ public void updateGraphics() { /* * ---- incrementButtonsColor ---------------------------------------------- */ - private final ObjectProperty incrementButtonsColor = new SimpleObjectProperty(this, "incrementButtonsColor", DEFAULT_INCREMENT_BUTTON_COLOR) { + private final ObjectProperty incrementButtonsColor = new SimpleObjectProperty<>(this, "incrementButtonsColor", DEFAULT_INCREMENT_BUTTON_COLOR) { @Override protected void invalidated() { - if ( get() == null ) { + if (get() == null) { set(DEFAULT_INCREMENT_BUTTON_COLOR); } else { @@ -358,12 +358,12 @@ public boolean isInvalid() { /* * ---- invalidColor ------------------------------------------------------- */ - private final ObjectProperty invalidColor = new SimpleObjectProperty(this, "invalidColor", Color.RED) { + private final ObjectProperty invalidColor = new SimpleObjectProperty<>(this, "invalidColor", Color.RED) { @Override protected void invalidated() { - if ( get() == null ) { + if (get() == null) { set(Color.RED); - } else if ( isInvalid() ) { + } else if (isInvalid()) { changeLabelsColor(get()); } } diff --git a/app/display/waterfallplot/src/main/java/org/phoebus/applications/waterfallplotwidget/WaterfallPlotWidgetRepresentation.java b/app/display/waterfallplot/src/main/java/org/phoebus/applications/waterfallplotwidget/WaterfallPlotWidgetRepresentation.java index 443c0c5a7e..80e76aea0f 100644 --- a/app/display/waterfallplot/src/main/java/org/phoebus/applications/waterfallplotwidget/WaterfallPlotWidgetRepresentation.java +++ b/app/display/waterfallplot/src/main/java/org/phoebus/applications/waterfallplotwidget/WaterfallPlotWidgetRepresentation.java @@ -395,9 +395,7 @@ public void dispose() try { Runnable stopScheduledRedrawing = futureReturningStopScheduledRedrawing.get(); stopScheduledRedrawing.run(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } catch (ExecutionException e) { + } catch (InterruptedException | ExecutionException e) { throw new RuntimeException(e); } finally { unregisterPropertyListeners(); diff --git a/app/eslog/src/main/java/org/phoebus/applications/eslog/EsLogInstance.java b/app/eslog/src/main/java/org/phoebus/applications/eslog/EsLogInstance.java index f2d256b92c..1ad3713e1b 100644 --- a/app/eslog/src/main/java/org/phoebus/applications/eslog/EsLogInstance.java +++ b/app/eslog/src/main/java/org/phoebus/applications/eslog/EsLogInstance.java @@ -181,8 +181,8 @@ public EsLogInstance(final AppDescriptor app) throws Exception filterBtn.setMnemonicParsing(true); filterBtn.setOnAction(this::openFilterDialog); - final var msgList = new TableView( - model.getObservable()); + final var msgList = new TableView<>( + model.getObservable()); var colDate = new TableColumn("Date"); colDate.setMinWidth(170); colDate.setCellValueFactory(new LogValueFactory(EventLogMessage.DATE)); diff --git a/app/eslog/src/main/java/org/phoebus/applications/eslog/FilterDialog.java b/app/eslog/src/main/java/org/phoebus/applications/eslog/FilterDialog.java index 0a622d237f..69536aa954 100644 --- a/app/eslog/src/main/java/org/phoebus/applications/eslog/FilterDialog.java +++ b/app/eslog/src/main/java/org/phoebus/applications/eslog/FilterDialog.java @@ -54,7 +54,7 @@ public FilterDialog(PropertyFilter[] filters) // top row: severity grid.add(new Label("Min Severity:"), 0, 0); - this.severityCombo = new ComboBox(); + this.severityCombo = new ComboBox<>(); this.severityCombo.getItems().addAll(Helpers.LOG_LEVELS); grid.add(this.severityCombo, 1, 0); diff --git a/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/ArchiveModel.java b/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/ArchiveModel.java index 12f0386b3a..89acc4c85c 100644 --- a/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/ArchiveModel.java +++ b/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/ArchiveModel.java @@ -12,7 +12,7 @@ public abstract class ArchiveModel extends Model { private final Set> listeners = Collections - .newSetFromMap(new WeakHashMap, Boolean>()); + .newSetFromMap(new WeakHashMap<>()); public void addListener(ArchiveModelListener listener) { diff --git a/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/JMSReceiver.java b/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/JMSReceiver.java index ca83458ef8..afec3d3d8f 100644 --- a/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/JMSReceiver.java +++ b/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/JMSReceiver.java @@ -91,7 +91,7 @@ public void addListener(String topic, LiveModel listener) this.listeners .computeIfAbsent(topic, t -> Collections.newSetFromMap( - new WeakHashMap, Boolean>())) + new WeakHashMap<>())) .add(listener); } } diff --git a/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/LiveModel.java b/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/LiveModel.java index 1a9e70e296..c38ad9af1a 100644 --- a/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/LiveModel.java +++ b/app/eslog/src/main/java/org/phoebus/applications/eslog/archivedjmslog/LiveModel.java @@ -20,7 +20,7 @@ public class LiveModel extends Model { protected String dateField; private Set> listeners = Collections - .newSetFromMap(new WeakHashMap, Boolean>()); + .newSetFromMap(new WeakHashMap<>()); private volatile boolean running = false; private Function parser; diff --git a/app/log-configuration/src/main/java/org/phoebus/applications/utility/LoggingConfiguration.java b/app/log-configuration/src/main/java/org/phoebus/applications/utility/LoggingConfiguration.java index 89e1e36157..977a5fb8df 100644 --- a/app/log-configuration/src/main/java/org/phoebus/applications/utility/LoggingConfiguration.java +++ b/app/log-configuration/src/main/java/org/phoebus/applications/utility/LoggingConfiguration.java @@ -97,7 +97,7 @@ protected Node createFxScene() { TreeTableColumn dropBoxColumn = new TreeTableColumn<>("Logging Level"); dropBoxColumn.setPrefWidth(100); dropBoxColumn.setCellFactory(ComboBoxTreeTableCell.forTreeTableColumn(levels)); - dropBoxColumn.setCellValueFactory(new Callback, ObservableValue>() { + dropBoxColumn.setCellValueFactory(new Callback<>() { @Override public ObservableValue call(CellDataFeatures param) { @@ -105,7 +105,7 @@ public ObservableValue call(CellDataFeatures param) { if (logger != null) { Level level = logger.getLevel(); - return new ObservableValue() { + return new ObservableValue<>() { @Override public void removeListener(InvalidationListener listener) { @@ -149,31 +149,31 @@ public void addListener(ChangeListener listener) { } }); - TreeTableColumn useParentHandlersColumn = new TreeTableColumn( - "use ConsoleViewer"); + TreeTableColumn useParentHandlersColumn = new TreeTableColumn<>( + "use ConsoleViewer"); useParentHandlersColumn.setPrefWidth(100); useParentHandlersColumn.setCellFactory(CheckBoxTreeTableCell.forTreeTableColumn(useParentHandlersColumn)); useParentHandlersColumn.setCellValueFactory( - new Callback, ObservableValue>() { - - @Override - public ObservableValue call(CellDataFeatures param) { - SimpleBooleanProperty s = new SimpleBooleanProperty( - param.getValue().getValue().getEnableParentHandler()); - s.addListener(new ChangeListener() { - - @Override - public void changed(ObservableValue observable, Boolean oldValue, - Boolean newValue) { - param.getValue().getValue().setEnableParentHandler(newValue); - Logger logger = manager.getLogger(param.getValue().getValue().getFullName()); - if (logger != null) - logger.setUseParentHandlers(newValue); - } - }); - return s; - } - }); + new Callback<>() { + + @Override + public ObservableValue call(CellDataFeatures param) { + SimpleBooleanProperty s = new SimpleBooleanProperty( + param.getValue().getValue().getEnableParentHandler()); + s.addListener(new ChangeListener<>() { + + @Override + public void changed(ObservableValue observable, Boolean oldValue, + Boolean newValue) { + param.getValue().getValue().setEnableParentHandler(newValue); + Logger logger = manager.getLogger(param.getValue().getValue().getFullName()); + if (logger != null) + logger.setUseParentHandlers(newValue); + } + }); + return s; + } + }); TreeTableView treeTableView = new TreeTableView<>(root); treeTableView.showRootProperty().setValue(Boolean.FALSE); @@ -275,8 +275,8 @@ public void updateLoggerMap() { logger.config(() -> { return "adding: " + name + " " + String.join(".", fullName, name); }); - TreeItem newNode = new TreeItem(new NameNode(name, fullName, - manager.getLogger(fullName), manager.getLogger(fullName) != null ? true : false)); + TreeItem newNode = new TreeItem<>(new NameNode(name, fullName, + manager.getLogger(fullName), manager.getLogger(fullName) != null ? true : false)); newNode.setExpanded(true); parent.getChildren().add(newNode); FXCollections.sort(parent.getChildren(), Comparator.comparing(o -> o.getValue().getFullName())); diff --git a/app/logbook/inmemory/src/main/java/org/phoebus/applications/logbook/InMemoryLogClient.java b/app/logbook/inmemory/src/main/java/org/phoebus/applications/logbook/InMemoryLogClient.java index 3dfce4258c..0221806291 100644 --- a/app/logbook/inmemory/src/main/java/org/phoebus/applications/logbook/InMemoryLogClient.java +++ b/app/logbook/inmemory/src/main/java/org/phoebus/applications/logbook/InMemoryLogClient.java @@ -75,7 +75,7 @@ private static List inMemoryProperties() { } public InMemoryLogClient() { - logEntries = new HashMap(); + logEntries = new HashMap<>(); logIdCounter = new AtomicInteger(); } diff --git a/app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/model/OlogLog.java b/app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/model/OlogLog.java index 0500e76871..cb9a01599c 100644 --- a/app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/model/OlogLog.java +++ b/app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/model/OlogLog.java @@ -236,7 +236,7 @@ public void setDescription(String description) { @Override public Collection getProperties() { - return properties == null ? new ArrayList() : properties; + return properties == null ? new ArrayList<>() : properties; } @Override @@ -258,7 +258,7 @@ public void setProperties(Collection properties) { @Override public Collection getLogbooks() { - return logbooks == null ? new ArrayList() : logbooks; + return logbooks == null ? new ArrayList<>() : logbooks; } /** @@ -277,7 +277,7 @@ public void setLogbooks(Collection logbooks) { */ @Override public Collection getTags() { - return tags == null ? new ArrayList() : tags; + return tags == null ? new ArrayList<>() : tags; } /** @@ -291,7 +291,7 @@ public void setTags(Collection tags) { @Override public Collection getAttachments() { - return attachments == null ? new ArrayList() : attachments; + return attachments == null ? new ArrayList<>() : attachments; } /** diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/LogUtil.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/LogUtil.java index 22662c3b6d..65061d508f 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/LogUtil.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/LogUtil.java @@ -24,7 +24,7 @@ private LogUtil() { } static Collection toLogs(XmlLogs xmlLogs) { - Collection logs = new HashSet(); + Collection logs = new HashSet<>(); for (XmlLog xmlLog : xmlLogs.getLogs()) { logs.add(new OlogLog(xmlLog)); } @@ -32,7 +32,7 @@ static Collection toLogs(XmlLogs xmlLogs) { } public static Collection getLogDescriptions(Collection logs) { - Collection logDescriptions = new ArrayList(); + Collection logDescriptions = new ArrayList<>(); for (OlogLog log : logs) { logDescriptions.add(log.getDescription()); } diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogLog.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogLog.java index f22f08b147..06d6ba2cc6 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogLog.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogLog.java @@ -291,7 +291,7 @@ public void setTableId(Long tableId) { @XmlElementWrapper(name = "properties") @XmlElement(type = XmlProperty.class, name = "property", nillable = true) public Collection getProperties() { - return properties == null ? new ArrayList() : properties; + return properties == null ? new ArrayList<>() : properties; } @Override @@ -312,7 +312,7 @@ public void setXmlProperties(Collection properties) { @XmlElementWrapper(name = "logbooks") @XmlElement(type = XmlLogbook.class, name = "logbook") public Collection getLogbooks() { - return logbooks == null ? new ArrayList() : logbooks; + return logbooks == null ? new ArrayList<>() : logbooks; } /** @@ -332,7 +332,7 @@ public void setLogbooks(Collection logbooks) { @XmlElementWrapper(name = "tags") @XmlElement(type = XmlTag.class, name = "tag") public Collection getTags() { - return tags == null ? new ArrayList() : tags; + return tags == null ? new ArrayList<>() : tags; } /** @@ -358,7 +358,7 @@ public XmlAttachments getXmlAttachments() { @Override public Collection getAttachments() { - return attachments == null ? new ArrayList() : attachments; + return attachments == null ? new ArrayList<>() : attachments; } /** diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogProperty.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogProperty.java index 8d57c89d60..a91b6cecf3 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogProperty.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/OlogProperty.java @@ -31,7 +31,7 @@ public class OlogProperty implements Property { this.attributes = Collections.unmodifiableMap(xmlProperty .getAttributes()); else - this.attributes = new HashMap(); + this.attributes = new HashMap<>(); } /** diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlAttachments.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlAttachments.java index 2f376158f5..1be3a14c9d 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlAttachments.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlAttachments.java @@ -14,7 +14,7 @@ @XmlRootElement(name = "attachments") public class XmlAttachments { - private Collection attachments = new ArrayList(); + private Collection attachments = new ArrayList<>(); /** Creates a new instance of XmlAttachments. */ public XmlAttachments() { diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLog.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLog.java index dd2abd4d7f..2517dddb03 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLog.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLog.java @@ -41,9 +41,9 @@ public class XmlLog { private Date modifiedDate; // private String subject; private String description; - private Collection properties = new ArrayList(); - private Collection logbooks = new ArrayList(); - private Collection tags = new ArrayList(); + private Collection properties = new ArrayList<>(); + private Collection logbooks = new ArrayList<>(); + private Collection tags = new ArrayList<>(); private XmlAttachments attachments = new XmlAttachments(); /** Creates a new instance of XmlLog */ diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogbooks.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogbooks.java index f078f3f8db..26761f4c2f 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogbooks.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogbooks.java @@ -19,7 +19,7 @@ @XmlRootElement(name = "logbooks") public class XmlLogbooks { - private Collection logbooks = new ArrayList(); + private Collection logbooks = new ArrayList<>(); /** Creates a new instance of XmlLogbooks. */ public XmlLogbooks() { diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogs.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogs.java index 8b557db835..794137d717 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogs.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlLogs.java @@ -19,7 +19,7 @@ @XmlRootElement(name = "logs") public class XmlLogs { - private Collection logs = new ArrayList(); + private Collection logs = new ArrayList<>(); /** Creates a new instance of XmlLogs. */ public XmlLogs() { diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlProperties.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlProperties.java index 0495279a13..147a2a9b34 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlProperties.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlProperties.java @@ -19,7 +19,7 @@ @XmlRootElement(name = "properties") public class XmlProperties { - private Collection properties = new ArrayList(); + private Collection properties = new ArrayList<>(); /** Creates a new instance of XmlProperties. */ public XmlProperties() { diff --git a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlTags.java b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlTags.java index 806e563835..d0219142ed 100644 --- a/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlTags.java +++ b/app/logbook/olog/client/src/main/java/org/phoebus/olog/api/XmlTags.java @@ -19,7 +19,7 @@ @XmlRootElement(name = "tags") public class XmlTags { - private Collection tags = new ArrayList(); + private Collection tags = new ArrayList<>(); /** Creates a new instance of XmlTags. */ public XmlTags() { diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalenderViewController.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalenderViewController.java index 924ef05bd6..4a819a9780 100644 --- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalenderViewController.java +++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalenderViewController.java @@ -109,7 +109,7 @@ public void initialize() { searchParameters.addListener((observable, oldValue, newValue) -> query.getEditor().setText(newValue)); agenda = new Agenda(); - agenda.setEditAppointmentCallback(new Callback() { + agenda.setEditAppointmentCallback(new Callback<>() { @Override public Void call(Appointment appointment) { @@ -279,8 +279,8 @@ public void setLogs(List logs) { } private void refresh() { - map = new HashMap(); - map = this.logEntries.stream().collect(Collectors.toMap(new Function() { + map = new HashMap<>(); + map = this.logEntries.stream().collect(Collectors.toMap(new Function<>() { @Override public Appointment apply(LogEntry logentry) { @@ -288,9 +288,9 @@ public Appointment apply(LogEntry logentry) { appointment.withSummary(logentry.getDescription()); appointment.withDescription(logentry.getDescription()); appointment.withStartLocalDateTime( - LocalDateTime.ofInstant(logentry.getCreatedDate(), ZoneId.systemDefault())); + LocalDateTime.ofInstant(logentry.getCreatedDate(), ZoneId.systemDefault())); appointment.withEndLocalDateTime( - LocalDateTime.ofInstant(logentry.getCreatedDate().plusSeconds(2400), ZoneId.systemDefault())); + LocalDateTime.ofInstant(logentry.getCreatedDate().plusSeconds(2400), ZoneId.systemDefault())); List logbookNames = getLogbookNames(); if (logbookNames != null && !logbookNames.isEmpty()) { try { @@ -306,7 +306,7 @@ public Appointment apply(LogEntry logentry) { } return appointment; } - }, new Function() { + }, new Function<>() { @Override public LogEntry apply(LogEntry logentry) { diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogPropertiesController.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogPropertiesController.java index 6762dbaf6e..dd2bf49f9c 100644 --- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogPropertiesController.java +++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogPropertiesController.java @@ -248,12 +248,12 @@ private String getString() }); // Hide the headers - treeTableView.widthProperty().addListener(new ChangeListener() { + treeTableView.widthProperty().addListener(new ChangeListener<>() { @Override public void changed(ObservableValue ov, Number t, Number t1) { // Get the table header - Pane header = (Pane)treeTableView.lookup("TableHeaderRow"); - if(header!=null && header.isVisible()) { + Pane header = (Pane) treeTableView.lookup("TableHeaderRow"); + if (header != null && header.isVisible()) { header.setMaxHeight(0); header.setMinHeight(0); header.setPrefHeight(0); @@ -339,7 +339,7 @@ public SimpleStringProperty valueProperty() { } public SimpleObjectProperty nodeProperty() { - return new SimpleObjectProperty(this); + return new SimpleObjectProperty<>(this); } private PropertyTreeNode(String fullQualifiedName, String name, String value) { diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookQueryUtil.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookQueryUtil.java index 99d9802e75..3f1291e763 100644 --- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookQueryUtil.java +++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookQueryUtil.java @@ -32,7 +32,7 @@ public static enum Keys { // The human readable name of the query key private final String name; // A lookuptable for finding the Keys constant that matches the human readable query key - private static Map lookupTable = new HashMap(); + private static Map lookupTable = new HashMap<>(); static { lookupTable.put("desc", Keys.DESC); diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/AttachmentsEditorController.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/AttachmentsEditorController.java index d1cac86840..d5bf20b32b 100644 --- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/AttachmentsEditorController.java +++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/AttachmentsEditorController.java @@ -51,7 +51,6 @@ import javax.activation.MimetypesFileTypeMap; import javax.imageio.ImageIO; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; @@ -443,7 +442,7 @@ private boolean checkForHeicFiles(List files) { private File detectHeicFiles(List files) { for (File file : files) { try { - String mimeType = MimeTypeDetector.determineMimeType(new FileInputStream(file)); + String mimeType = MimeTypeDetector.determineMimeType(file); if (mimeType != null && mimeType.toLowerCase().contains("image/heic")) { return file; } diff --git a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCalenderDemo.java b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCalenderDemo.java index 7c54848daf..31377f034f 100644 --- a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCalenderDemo.java +++ b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCalenderDemo.java @@ -69,13 +69,13 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){ primaryStage.setScene(new Scene(root, 400, 400)); primaryStage.show(); - List logs = new ArrayList(); + List logs = new ArrayList<>(); - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); diff --git a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCellDemo.java b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCellDemo.java index 053f0dddcb..bbe168c334 100644 --- a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCellDemo.java +++ b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryCellDemo.java @@ -67,10 +67,10 @@ public void start(Stage primaryStage) throws Exception { ex.schedule(() -> { - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); @@ -89,10 +89,10 @@ public void start(Stage primaryStage) throws Exception { }, 2, TimeUnit.SECONDS); ex.schedule(() -> { - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); @@ -115,8 +115,8 @@ public void start(Stage primaryStage) throws Exception { .id(3L) .description( "Fast correctors for the vertical orbit have glitched to near saturation. Archiver shows there have been several episodes the past 24 hrs. Appears that FOFB in vertical plane might have momentary bad BPM reading.") - .withTags(new HashSet(Arrays.asList(TagImpl.of("Orbit", "active"), TagImpl.of("Studies", "active")))) - .inLogbooks(new HashSet(Arrays.asList(LogbookImpl.of("Operations", "active"), LogbookImpl.of("Electrical", "active")))) + .withTags(new HashSet<>(Arrays.asList(TagImpl.of("Orbit", "active"), TagImpl.of("Studies", "active")))) + .inLogbooks(new HashSet<>(Arrays.asList(LogbookImpl.of("Operations", "active"), LogbookImpl.of("Electrical", "active")))) .owner("nsls2-user"); listOfFiles.forEach(file -> { lb.attach(AttachmentImpl.of(file)); diff --git a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryDisplayDemo.java b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryDisplayDemo.java index 810884af70..d1bd94a278 100644 --- a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryDisplayDemo.java +++ b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryDisplayDemo.java @@ -104,10 +104,10 @@ public void start(Stage primaryStage) throws Exception { }, 2, TimeUnit.SECONDS); ex.schedule(() -> { - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); @@ -125,10 +125,10 @@ public void start(Stage primaryStage) throws Exception { }, 2, TimeUnit.SECONDS); ex.schedule(() -> { - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); diff --git a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryTableDemo.java b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryTableDemo.java index 7f04f9bed9..12cbb613d1 100644 --- a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryTableDemo.java +++ b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogEntryTableDemo.java @@ -92,13 +92,13 @@ public void start(Stage primaryStage) throws Exception { primaryStage.setScene(new Scene(root, 400, 400)); primaryStage.show(); - List logs = new ArrayList(); + List logs = new ArrayList<>(); - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); diff --git a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/QueryParserTest.java b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/QueryParserTest.java index 564046c6f8..91a5932a29 100644 --- a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/QueryParserTest.java +++ b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/QueryParserTest.java @@ -23,7 +23,7 @@ public class QueryParserTest { public void basic() { URI uri = URI.create("logbook://?desc=*Fault*Motor*&tags=operation"); Map queryParameters = LogbookQueryUtil.parseQueryURI(uri); - Map expectedMap = new HashMap(); + Map expectedMap = new HashMap<>(); expectedMap.put("desc", "*Fault*Motor*"); expectedMap.put("tags", "operation"); assertEquals(expectedMap, queryParameters); @@ -74,7 +74,7 @@ public void timeParsing() { public void emptyValueTest() { URI uri = URI.create("logbook://?desc=*Fault*Motor*&tags=operation&logbooks"); Map queryParameters = LogbookQueryUtil.parseQueryURI(uri); - Map expectedMap = new HashMap(); + Map expectedMap = new HashMap<>(); expectedMap.put("desc", "*Fault*Motor*"); expectedMap.put("tags", "operation"); expectedMap.put("logbooks", "*"); diff --git a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryCalenderViewController.java b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryCalenderViewController.java index 8b539d6fcb..31cdd238b1 100644 --- a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryCalenderViewController.java +++ b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryCalenderViewController.java @@ -85,7 +85,7 @@ public class LogEntryCalenderViewController extends LogbookSearchController { // Model private Map map; - private Map appointmentGroupMap = new TreeMap(); + private Map appointmentGroupMap = new TreeMap<>(); @FXML private AdvancedSearchViewController advancedSearchViewController; @@ -100,7 +100,7 @@ public void initialize() { resize.setText("<"); agenda = new Agenda(); - agenda.setEditAppointmentCallback(new Callback() { + agenda.setEditAppointmentCallback(new Callback<>() { @Override public Void call(Appointment appointment) { @@ -152,7 +152,7 @@ public Void call(Appointment appointment) { searchParameters.put(Keys.ENDTIME, TimeParser.format(java.time.Duration.ZERO)); advancedSearchViewController.setSearchParameters(searchParameters); - searchParameters.addListener(new MapChangeListener() { + searchParameters.addListener(new MapChangeListener<>() { @Override public void onChanged(Change change) { Platform.runLater(() -> { @@ -279,8 +279,8 @@ public void setLogs(List logs) { } private void refresh() { - map = new HashMap(); - map = this.logEntries.stream().collect(Collectors.toMap(new Function() { + map = new HashMap<>(); + map = this.logEntries.stream().collect(Collectors.toMap(new Function<>() { @Override public Appointment apply(LogEntry logentry) { @@ -288,21 +288,21 @@ public Appointment apply(LogEntry logentry) { appointment.withSummary(logentry.getDescription()); appointment.withDescription(logentry.getDescription()); appointment.withStartLocalDateTime( - LocalDateTime.ofInstant(logentry.getCreatedDate(), ZoneId.systemDefault())); + LocalDateTime.ofInstant(logentry.getCreatedDate(), ZoneId.systemDefault())); appointment.withEndLocalDateTime( - LocalDateTime.ofInstant(logentry.getCreatedDate().plusSeconds(2400), ZoneId.systemDefault())); + LocalDateTime.ofInstant(logentry.getCreatedDate().plusSeconds(2400), ZoneId.systemDefault())); List logbookNames = getLogbookNames(); - if(logbookNames !=null && !logbookNames.isEmpty()){ + if (logbookNames != null && !logbookNames.isEmpty()) { int index = logbookNames.indexOf(logentry.getLogbooks().iterator().next().getName()); - if(index >= 0 && index <= 22){ - appointment.setAppointmentGroup(appointmentGroupMap.get(String.format("group%02d",(index+1)))); + if (index >= 0 && index <= 22) { + appointment.setAppointmentGroup(appointmentGroupMap.get(String.format("group%02d", (index + 1)))); } else { appointment.setAppointmentGroup(appointmentGroupMap.get(String.format("group%02d", 23))); } } return appointment; } - }, new Function() { + }, new Function<>() { @Override public LogEntry apply(LogEntry logentry) { diff --git a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryController.java b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryController.java index 91ae9aced4..336a59cea0 100644 --- a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryController.java +++ b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryController.java @@ -68,7 +68,7 @@ public void initialize() { logDescription.setBackground(Background.EMPTY); - logTags.setCellFactory(listView -> new ListCell() { + logTags.setCellFactory(listView -> new ListCell<>() { @Override public void updateItem(String item, boolean empty) { super.updateItem(item, empty); @@ -82,7 +82,7 @@ public void updateItem(String item, boolean empty) { } }); - LogLogbooks.setCellFactory(listView -> new ListCell() { + LogLogbooks.setCellFactory(listView -> new ListCell<>() { @Override public void updateItem(String item, boolean empty) { super.updateItem(item, empty); @@ -154,7 +154,7 @@ private ImageView createImageView(final File imageFile) { final Image image = new Image(new FileInputStream(imageFile), 150, 0, true, true); imageView = new ImageView(image); imageView.setFitWidth(150); - imageView.setOnMouseClicked(new EventHandler() { + imageView.setOnMouseClicked(new EventHandler<>() { @Override public void handle(MouseEvent mouseEvent) { diff --git a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogPropertiesController.java b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogPropertiesController.java index 22130e373c..d44c0a782f 100644 --- a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogPropertiesController.java +++ b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogPropertiesController.java @@ -61,7 +61,7 @@ public ObservableValue call(TreeTableColumn.CellDataFeatures call(TreeTableColumn param) { - return new TreeTableCell () { + return new TreeTableCell<>() { private TextField textField; @@ -85,7 +85,7 @@ public void cancelEdit() { } @Override - public void updateItem(String item, boolean empty){ + public void updateItem(String item, boolean empty) { super.updateItem(item, empty); if (empty) { setGraphic(null); @@ -110,6 +110,7 @@ private void createTextField() { } }); } + private String getString() { return getItem() == null ? "" : getItem().toString(); } diff --git a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryCalenderDemo.java b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryCalenderDemo.java index a5087b1ba8..cecdf5e51e 100644 --- a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryCalenderDemo.java +++ b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryCalenderDemo.java @@ -64,13 +64,13 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){ primaryStage.setScene(new Scene(root, 400, 400)); primaryStage.show(); - List logs = new ArrayList(); + List logs = new ArrayList<>(); - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); diff --git a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryDisplayDemo.java b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryDisplayDemo.java index 70725051e5..011580b865 100644 --- a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryDisplayDemo.java +++ b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryDisplayDemo.java @@ -64,10 +64,10 @@ public void start(Stage primaryStage) throws Exception { }, 2, TimeUnit.SECONDS); ex.schedule(() -> { - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); @@ -79,10 +79,10 @@ public void start(Stage primaryStage) throws Exception { }, 2, TimeUnit.SECONDS); ex.schedule(() -> { - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); @@ -95,8 +95,8 @@ public void start(Stage primaryStage) throws Exception { .createdDate(Instant.now()) .description( "Fast correctors for the vertical orbit have glitched to near saturation. Archiver shows there have been several episodes the past 24 hrs. Appears that FOFB in vertical plane might have momentary bad BPM reading.") - .withTags(new HashSet(Arrays.asList(TagImpl.of("Orbit", "active"), TagImpl.of("Studies", "active")))) - .inLogbooks(new HashSet(Arrays.asList(LogbookImpl.of("Operations", "active")))); + .withTags(new HashSet<>(Arrays.asList(TagImpl.of("Orbit", "active"), TagImpl.of("Studies", "active")))) + .inLogbooks(new HashSet<>(Arrays.asList(LogbookImpl.of("Operations", "active")))); listOfFiles.forEach(file -> { lb.attach(AttachmentImpl.of(file)); }); diff --git a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntrySearchDemo.java b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntrySearchDemo.java index eff4b886f0..3733795001 100644 --- a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntrySearchDemo.java +++ b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntrySearchDemo.java @@ -64,13 +64,13 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){ primaryStage.setScene(new Scene(root, 400, 400)); primaryStage.show(); - List logs = new ArrayList(); + List logs = new ArrayList<>(); - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); diff --git a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryTableDemo.java b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryTableDemo.java index da9ac13cbf..69a8fdf37d 100644 --- a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryTableDemo.java +++ b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/LogEntryTableDemo.java @@ -64,13 +64,13 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){ primaryStage.setScene(new Scene(root, 400, 400)); primaryStage.show(); - List logs = new ArrayList(); + List logs = new ArrayList<>(); - Set tags = new HashSet(); + Set tags = new HashSet<>(); tags.add(TagImpl.of("tag1", "active")); tags.add(TagImpl.of("tag2", "active")); - Set logbooks = new HashSet(); + Set logbooks = new HashSet<>(); logbooks.add(LogbookImpl.of("logbook1", "active")); logbooks.add(LogbookImpl.of("logbook2", "active")); diff --git a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/QueryParserTest.java b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/QueryParserTest.java index 4450b56433..8c5e2f0ddb 100644 --- a/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/QueryParserTest.java +++ b/app/logbook/ui/src/test/java/org/phoebus/logbook/ui/QueryParserTest.java @@ -22,7 +22,7 @@ public class QueryParserTest { public void basic() { URI uri = URI.create("logbook://?search=*Fault*Motor*&tag=operation"); Map queryParameters = LogbookQueryUtil.parseQueryURI(uri); - Map expectedMap = new HashMap(); + Map expectedMap = new HashMap<>(); expectedMap.put("search", "*Fault*Motor*"); expectedMap.put("tag", "operation"); assertEquals(expectedMap, queryParameters); @@ -47,7 +47,7 @@ public void timeParsing() { public void emptyValueTest() { URI uri = URI.create("logbook://?search=*Fault*Motor*&tag=operation&logbook"); Map queryParameters = LogbookQueryUtil.parseQueryURI(uri); - Map expectedMap = new HashMap(); + Map expectedMap = new HashMap<>(); expectedMap.put("search", "*Fault*Motor*"); expectedMap.put("tag", "operation"); expectedMap.put("logbook", "*"); diff --git a/app/pvtree/src/main/java/org/phoebus/applications/pvtree/FieldParser.java b/app/pvtree/src/main/java/org/phoebus/applications/pvtree/FieldParser.java index 3473db706d..145861c7b1 100644 --- a/app/pvtree/src/main/java/org/phoebus/applications/pvtree/FieldParser.java +++ b/app/pvtree/src/main/java/org/phoebus/applications/pvtree/FieldParser.java @@ -46,7 +46,7 @@ public static Map> parse(final String field_configuration) throw new Exception("Missing end of field list in '" + rec_config + "'"); // Get fields for that type final String[] field_configs = rec_config.substring(i1+1, i2).split("\\s*,\\s*"); - final ArrayList fields = new ArrayList(); + final ArrayList fields = new ArrayList<>(); for (String field : field_configs) { final String field_spec = field.trim(); diff --git a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/client/RunEngineHttpClient.java b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/client/RunEngineHttpClient.java index 45871e5166..e185722f75 100644 --- a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/client/RunEngineHttpClient.java +++ b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/client/RunEngineHttpClient.java @@ -72,7 +72,8 @@ public Envelope call(ApiEndpoint ep, Object body) throws Exception { // raw JSON (Map) for CLI / REPL public Map send(ApiEndpoint api, Object body) throws Exception { - return send(api, body, new TypeReference>() {}); + return send(api, body, new TypeReference<>() { + }); } public T send(ApiEndpoint api, Object body, Class type) throws Exception { diff --git a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanEditorController.java b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanEditorController.java index d1fc80df11..9d8ad3e4ef 100644 --- a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanEditorController.java +++ b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanEditorController.java @@ -355,7 +355,7 @@ private void initializeTable() { // Add tooltips to parameter names paramCol.setCellFactory(column -> { - TableCell cell = new TableCell() { + TableCell cell = new TableCell<>() { @Override protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); diff --git a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanViewerController.java b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanViewerController.java index 68c535a66f..b5e257f652 100644 --- a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanViewerController.java +++ b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/controller/RePlanViewerController.java @@ -156,7 +156,7 @@ private void initializeTable() { valueCol.setMinWidth(50); paramCol.setCellFactory(column -> { - TableCell cell = new TableCell() { + TableCell cell = new TableCell<>() { @Override protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); @@ -185,7 +185,7 @@ protected void updateItem(String item, boolean empty) { }); valueCol.setCellFactory(column -> { - TableCell cell = new TableCell() { + TableCell cell = new TableCell<>() { @Override protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); diff --git a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/util/PythonParameterConverter.java b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/util/PythonParameterConverter.java index 8fb1aee336..9abcf500db 100644 --- a/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/util/PythonParameterConverter.java +++ b/app/queue-server/network/src/main/java/org/phoebus/applications/queueserver/util/PythonParameterConverter.java @@ -164,7 +164,8 @@ public Map convertParameters(List parameters) { // Check if result contains an error Map resultMap = objectMapper.readValue(resultJson, - new TypeReference>() {}); + new TypeReference<>() { + }); if (resultMap.containsKey("error")) { String errorMsg = "Python type conversion failed: " + resultMap.get("error"); diff --git a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTTimePlot.java b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTTimePlot.java index 102f8d6d94..276514f39c 100644 --- a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTTimePlot.java +++ b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/RTTimePlot.java @@ -63,12 +63,10 @@ public RTTimePlot(final boolean active) }); // Stop scrolling when x axis modified by user - plot.addListener(new RTPlotListener() - { + plot.addListener(new RTPlotListener<>() { @Override - public void changedXAxis(final Axis x_axis) - { - if (! isScrolling()) + public void changedXAxis(final Axis x_axis) { + if (!isScrolling()) return; final long now = Instant.now().getEpochSecond(); final AxisRange value_range = x_axis.getValueRange(); diff --git a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/data/ArrayPlotDataProvider.java b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/data/ArrayPlotDataProvider.java index 59744c8e2c..22e0c75d08 100644 --- a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/data/ArrayPlotDataProvider.java +++ b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/data/ArrayPlotDataProvider.java @@ -35,7 +35,7 @@ public ArrayPlotDataProvider(final List> data) /** Construct with internal array */ public ArrayPlotDataProvider() { - this(new ArrayList>()); + this(new ArrayList<>()); } /** @param item Item to add to the list diff --git a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/PlotProcessor.java b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/PlotProcessor.java index 72fd491451..5c529aa945 100644 --- a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/PlotProcessor.java +++ b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/PlotProcessor.java @@ -126,24 +126,19 @@ private boolean isOrdered(final PlotDataProvider data) */ public Future determineValueRange(final PlotDataProvider data, AxisRange position_range) { - return thread_pool.submit(new Callable() - { + return thread_pool.submit(new Callable<>() { @Override - public ValueRange call() throws Exception - { + public ValueRange call() throws Exception { double low = Double.MAX_VALUE; double high = -Double.MAX_VALUE; final PlotDataSearch search = new PlotDataSearch<>(); - if (! data.getLock().tryLock(10, TimeUnit.SECONDS)) + if (!data.getLock().tryLock(10, TimeUnit.SECONDS)) throw new TimeoutException("Cannot lock " + data); - try - { - if (data.size() > 0) - { + try { + if (data.size() > 0) { int start, stop; - if (isOrdered(data)) - { + if (isOrdered(data)) { // Find start..stop indices from ordered positions to match axis range. // Consider first sample at-or-before start start = search.findSampleLessOrEqual(data, position_range.getLow()); @@ -155,20 +150,17 @@ public ValueRange call() throws Exception stop = 0; if (logger.isLoggable(Level.FINE)) logger.log(Level.FINE, "For " + data.size() + " samples, checking elements " + start + " .. " + stop + - " which are positioned within " + position_range.getLow() + " .. " + position_range.getHigh()); - } - else - { + " which are positioned within " + position_range.getLow() + " .. " + position_range.getHigh()); + } else { // Data does not have ordered 'positions', so consider all samples start = 0; - stop = data.size()-1; + stop = data.size() - 1; } // If data is completely outside the position_range, // we end up using just data[0] // Check [start .. stop], including stop - for (int idx = start; idx <= stop; idx++) - { + for (int idx = start; idx <= stop; idx++) { final PlotDataItem item = data.get(idx); final double value = item.getValue(); if (!Double.isFinite(value)) @@ -184,9 +176,7 @@ public ValueRange call() throws Exception high = item.getMax(); } } - } - finally - { + } finally { data.getLock().unlock(); } return new ValueRange(low, high); @@ -210,11 +200,9 @@ private boolean isTraceVisible(final Trace trace) */ public Future determineValueRange(final YAxisImpl axis, AxisRange position_range) { - return thread_pool.submit(new Callable() - { + return thread_pool.submit(new Callable<>() { @Override - public ValueRange call() throws Exception - { + public ValueRange call() throws Exception { // In parallel, determine range of all traces in this axis final List> ranges = new ArrayList<>(); for (Trace trace : axis.getTraces()) @@ -224,8 +212,7 @@ public ValueRange call() throws Exception // Merge the trace ranges into overall axis range double low = Double.MAX_VALUE; double high = -Double.MAX_VALUE; - for (Future result : ranges) - { + for (Future result : ranges) { final ValueRange range = result.get(); if (range.getLow() < low) low = range.getLow(); diff --git a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/ToolbarHandler.java b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/ToolbarHandler.java index e3e80c9774..21339f8f44 100644 --- a/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/ToolbarHandler.java +++ b/app/rtplot/src/main/java/org/csstudio/javafx/rtplot/internal/ToolbarHandler.java @@ -148,12 +148,10 @@ private void addOptions(final boolean active) dialog.showAndWait(); edit_annotation.setDisable(! haveUserAnnotations()); }); - plot.addListener(new RTPlotListener() - { + plot.addListener(new RTPlotListener<>() { @Override - public void changedAnnotations() - { - Platform.runLater(() -> edit_annotation.setDisable(! haveUserAnnotations())); + public void changedAnnotations() { + Platform.runLater(() -> edit_annotation.setDisable(!haveUserAnnotations())); } }); crosshair.setOnAction(event -> plot.showCrosshair(crosshair.isSelected())); diff --git a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/DynamicDemoData.java b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/DynamicDemoData.java index bb472189da..56ca898c6e 100644 --- a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/DynamicDemoData.java +++ b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/DynamicDemoData.java @@ -52,14 +52,14 @@ public void add() final double y = 0.1*Math.random() + 2.0 + Math.sin(2.0*Math.PI * x / period); // Some raw samples, rest min/max/average if (Math.random() > 0.3) - item = new SimpleDataItem(time, y); + item = new SimpleDataItem<>(time, y); else { final double noise = 0.2; final double min = y - y*noise*Math.random(); final double max = y + y*noise*Math.random(); final double stddev = (max - y)/2; - item = new SimpleDataItem(time, y, stddev, min, max, "Optimized"); + item = new SimpleDataItem<>(time, y, stddev, min, max, "Optimized"); } } diff --git a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TimePlotDemo.java b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TimePlotDemo.java index 4a5e421483..6c874100fe 100644 --- a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TimePlotDemo.java +++ b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TimePlotDemo.java @@ -92,31 +92,29 @@ public void start(final Stage stage) throws Exception plot.showToolbar(false); - plot.addListener(new RTPlotListener() - { + plot.addListener(new RTPlotListener<>() { @Override - public void changedXAxis(Axis x_axis) - { + public void changedXAxis(Axis x_axis) { System.out.println("X Axis changed: " + x_axis); } + @Override - public void changedYAxis(YAxis y_axis) - { + public void changedYAxis(YAxis y_axis) { System.out.println("Y Axis changed: " + y_axis); } + @Override - public void changedPlotMarker(final int index) - { + public void changedPlotMarker(final int index) { System.out.println("Moved " + plot.getMarkers().get(index)); } + @Override - public void changedAnnotations() - { + public void changedAnnotations() { System.out.println("Annotations changed"); } + @Override - public void changedCursors() - { + public void changedCursors() { // System.out.println("Cursors changed"); } }); diff --git a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TraceAnalyzerTest.java b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TraceAnalyzerTest.java index a887db2405..5019c561aa 100644 --- a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TraceAnalyzerTest.java +++ b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TraceAnalyzerTest.java @@ -29,7 +29,7 @@ public void testFindSample() throws Exception { final ArrayPlotDataProvider data = new ArrayPlotDataProvider<>(); for (int i=0; i<=10; ++i) - data.add(new SimpleDataItem(Instant.ofEpochSecond(10*i), 10.0*i-50)); + data.add(new SimpleDataItem<>(Instant.ofEpochSecond(10 * i), 10.0 * i - 50)); for (int i=0; i() - { + plot.addListener(new RTPlotListener<>() { @Override - public void changedXAxis(Axis x_axis) - { + public void changedXAxis(Axis x_axis) { System.out.println("X Axis changed: " + x_axis); } + @Override - public void changedYAxis(YAxis y_axis) - { + public void changedYAxis(YAxis y_axis) { System.out.println("Y Axis changed: " + y_axis); } }); diff --git a/app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/json/VTypeDeserializer.java b/app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/json/VTypeDeserializer.java index 490c25eb2e..24526d1651 100644 --- a/app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/json/VTypeDeserializer.java +++ b/app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/json/VTypeDeserializer.java @@ -42,15 +42,8 @@ public class VTypeDeserializer extends JsonDeserializer { public VType deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { String valueAsJson = jsonParser.getCodec().readTree(jsonParser).toString(); - JsonReader jsonReader = null; - try { - jsonReader = Json.createReader(new ByteArrayInputStream(valueAsJson.getBytes())); - return VTypeToJson.toVType(jsonReader.readObject()); - } - finally { - if(jsonReader != null) { - jsonReader.close(); - } - } + try (JsonReader jsonReader = Json.createReader(new ByteArrayInputStream(valueAsJson.getBytes()))) { + return VTypeToJson.toVType(jsonReader.readObject()); + } } } diff --git a/app/scan/client/src/main/java/org/csstudio/scan/client/ScanInfoModel.java b/app/scan/client/src/main/java/org/csstudio/scan/client/ScanInfoModel.java index 495a0f3701..55f1ff4cdd 100644 --- a/app/scan/client/src/main/java/org/csstudio/scan/client/ScanInfoModel.java +++ b/app/scan/client/src/main/java/org/csstudio/scan/client/ScanInfoModel.java @@ -56,7 +56,7 @@ public class ScanInfoModel private volatile List infos = Collections.emptyList(); /** Listeners */ - private List listeners = new CopyOnWriteArrayList(); + private List listeners = new CopyOnWriteArrayList<>(); /** Obtain reference to the singleton instance. diff --git a/app/scan/model/src/main/java/org/csstudio/scan/command/CommandSequence.java b/app/scan/model/src/main/java/org/csstudio/scan/command/CommandSequence.java index b90e37da98..4844569d60 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/command/CommandSequence.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/command/CommandSequence.java @@ -66,7 +66,7 @@ public CommandSequence(final ScanCommand... commands) */ public CommandSequence(final Collection commands) { - this.commands = new ArrayList(); + this.commands = new ArrayList<>(); this.commands.addAll(commands); } diff --git a/app/scan/model/src/main/java/org/csstudio/scan/command/LogCommand.java b/app/scan/model/src/main/java/org/csstudio/scan/command/LogCommand.java index 59893592e6..54e5fdcf08 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/command/LogCommand.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/command/LogCommand.java @@ -95,7 +95,7 @@ public void addXMLElements(final Document dom, final Element command_element) @Override public void readXML(final Element element) throws Exception { - final List devices = new ArrayList(); + final List devices = new ArrayList<>(); Element node = XMLUtil.getChildElement(element, "devices"); if (node == null) throw new Exception("Missing 'devices'"); diff --git a/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandFactory.java b/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandFactory.java index 26ae9bdc74..3a388d92dc 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandFactory.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandFactory.java @@ -86,7 +86,7 @@ public static URL getImage(final String id) */ public static List readCommands(Node node) throws Exception { - final List commands = new ArrayList(); + final List commands = new ArrayList<>(); while (node != null) { if (node.getNodeType() == Node.ELEMENT_NODE) diff --git a/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandWithBody.java b/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandWithBody.java index 2276e9ef9e..56d6d2b887 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandWithBody.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/command/ScanCommandWithBody.java @@ -51,7 +51,7 @@ public ScanCommandWithBody(final List body) */ protected static List toList(final ScanCommand[] commands) { - final List list = new ArrayList(commands.length); + final List list = new ArrayList<>(commands.length); for (ScanCommand command : commands) list.add(command); return list; diff --git a/app/scan/model/src/main/java/org/csstudio/scan/command/ScanScriptContext.java b/app/scan/model/src/main/java/org/csstudio/scan/command/ScanScriptContext.java index ab23d8a337..9b21d0aaa6 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/command/ScanScriptContext.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/command/ScanScriptContext.java @@ -47,9 +47,9 @@ abstract public class ScanScriptContext public double[][] getData(final String... devices) throws Exception { ScanDataIterator sheet = new ScanDataIterator(getScanData(), devices); - final List> data = new ArrayList>(devices.length); + final List> data = new ArrayList<>(devices.length); for (int i=0; i()); + data.add(new ArrayList<>()); while (sheet.hasNext()) { final ScanSample[] samples = sheet.getSamples(); diff --git a/app/scan/model/src/main/java/org/csstudio/scan/command/ScriptCommand.java b/app/scan/model/src/main/java/org/csstudio/scan/command/ScriptCommand.java index 3d152817eb..11c5beea24 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/command/ScriptCommand.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/command/ScriptCommand.java @@ -118,7 +118,7 @@ public void readXML(final Element element) throws Exception { setScript(XMLUtil.getChildString(element, "path").orElse("")); - final List arguments = new ArrayList(); + final List arguments = new ArrayList<>(); Element node = XMLUtil.getChildElement(element, "arguments"); if (node != null) { diff --git a/app/scan/model/src/main/java/org/csstudio/scan/util/TextTable.java b/app/scan/model/src/main/java/org/csstudio/scan/util/TextTable.java index 6636a71e60..6a55fedc37 100644 --- a/app/scan/model/src/main/java/org/csstudio/scan/util/TextTable.java +++ b/app/scan/model/src/main/java/org/csstudio/scan/util/TextTable.java @@ -21,16 +21,16 @@ public class TextTable { /** Headers for each column */ - final private List headers = new ArrayList(); + final private List headers = new ArrayList<>(); /** Widths info for each column */ - final private List widths = new ArrayList(); + final private List widths = new ArrayList<>(); /** Rows of the table */ - final private List> rows = new ArrayList>(); + final private List> rows = new ArrayList<>(); /** Headers for each column */ - private List current_row = new ArrayList(); + private List current_row = new ArrayList<>(); /** Where to write */ final private PrintWriter writer; @@ -98,7 +98,7 @@ public void addCell(final String value) if (current_row.size() >= widths.size()) { rows.add(current_row); - current_row = new ArrayList(); + current_row = new ArrayList<>(); } } diff --git a/app/scan/ui/src/main/java/org/csstudio/scan/ui/editor/actions/RemoveCommands.java b/app/scan/ui/src/main/java/org/csstudio/scan/ui/editor/actions/RemoveCommands.java index 3a2237862a..31b692dbec 100644 --- a/app/scan/ui/src/main/java/org/csstudio/scan/ui/editor/actions/RemoveCommands.java +++ b/app/scan/ui/src/main/java/org/csstudio/scan/ui/editor/actions/RemoveCommands.java @@ -45,7 +45,7 @@ public void run() // // Similarly, removed items are remembered in reverse // so that the undo can simply undo each removed item. - removals = new ArrayList(); + removals = new ArrayList<>(); try { final int N = to_remove.size(); diff --git a/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceArchiveReader.java b/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceArchiveReader.java index 2c90dbec63..d1a8b4dbab 100644 --- a/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceArchiveReader.java +++ b/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceArchiveReader.java @@ -41,7 +41,7 @@ public class ApplianceArchiveReader implements ArchiveReader { private final boolean useNewOptimizedOperator; Map iterators = Collections.synchronizedMap( - new WeakHashMap()); + new WeakHashMap<>()); /** * Constructor that sets appliance archiver reader url. @@ -240,7 +240,7 @@ private List search(String reg) throws IOException { String searchURL = httpURL + ApplianceArchiveReaderConstants.SEARCH_PATH + URLEncoder.encode(reg, "UTF-8"); URL url = new URL(searchURL); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); BufferedReader br = null; try { connection.connect(); diff --git a/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceValueIterator.java b/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceValueIterator.java index b565ff272e..9c3b27100b 100644 --- a/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceValueIterator.java +++ b/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/appliance/ApplianceValueIterator.java @@ -107,7 +107,7 @@ protected void fetchDataInternal(String pvName) throws ArchiverApplianceExceptio java.sql.Timestamp sqlStartTimestamp = TimestampHelper.toSQLTimestamp(start); java.sql.Timestamp sqlEndTimestamp = TimestampHelper.toSQLTimestamp(end); - HashMap otherParms = new HashMap(); + HashMap otherParms = new HashMap<>(); otherParms.put("fetchLatestMetadata", "true"); // Include Metadata like EnumLabels in the headers DataRetrieval dataRetrieval = reader.createDataRetriveal(reader.getDataRetrievalURL()); diff --git a/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/channelarchiver/file/ArchiveFileIndexReader.java b/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/channelarchiver/file/ArchiveFileIndexReader.java index 3599e144ef..ef39039834 100644 --- a/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/channelarchiver/file/ArchiveFileIndexReader.java +++ b/app/trends/archive-reader/src/main/java/org/phoebus/archive/reader/channelarchiver/file/ArchiveFileIndexReader.java @@ -73,7 +73,7 @@ private Queue readHashTable() throws IOException long start = buffer.getUnsignedInt(); long size = buffer.getUnsignedInt(); - Queue ret = new ArrayDeque(); + Queue ret = new ArrayDeque<>(); buffer.offset(start); while (--size > 0) { diff --git a/core/formula/src/main/java/org/csstudio/apputil/formula/string/StringConcatFunction.java b/core/formula/src/main/java/org/csstudio/apputil/formula/string/StringConcatFunction.java index 544d800512..9b496c673d 100644 --- a/core/formula/src/main/java/org/csstudio/apputil/formula/string/StringConcatFunction.java +++ b/core/formula/src/main/java/org/csstudio/apputil/formula/string/StringConcatFunction.java @@ -79,7 +79,7 @@ private List getStringArray(VType value) { } else if (value instanceof VNumberArray) { - List stringData = new ArrayList(); + List stringData = new ArrayList<>(); ListNumber data = ((VNumberArray) value).getData(); for (int i = 0; i < data.size(); i++) { stringData.add(String.valueOf(data.getDouble(i))); diff --git a/core/framework/src/main/java/org/phoebus/framework/adapter/AdapterService.java b/core/framework/src/main/java/org/phoebus/framework/adapter/AdapterService.java index fcebb02b7b..79ef820b1b 100644 --- a/core/framework/src/main/java/org/phoebus/framework/adapter/AdapterService.java +++ b/core/framework/src/main/java/org/phoebus/framework/adapter/AdapterService.java @@ -27,11 +27,11 @@ public class AdapterService { /** * A map where the key is a type mapped to a list of adapter that can convert to this type. */ - private static Map> adapters = new HashMap>(); + private static Map> adapters = new HashMap<>(); /** * A map where the key is a type mapped to a list of adapters that can process this type to other types. */ - private static Map> adaptables = new HashMap>(); + private static Map> adaptables = new HashMap<>(); static { loader = ServiceLoader.load(AdapterFactory.class); diff --git a/core/framework/src/main/java/org/phoebus/framework/persistence/PositionalXMLReader.java b/core/framework/src/main/java/org/phoebus/framework/persistence/PositionalXMLReader.java index 62e353cc0b..77126d2f05 100644 --- a/core/framework/src/main/java/org/phoebus/framework/persistence/PositionalXMLReader.java +++ b/core/framework/src/main/java/org/phoebus/framework/persistence/PositionalXMLReader.java @@ -64,7 +64,7 @@ public static Document readXML(final InputStream stream) throws Exception throw new RuntimeException("Can't create SAX parser / DOM builder.", e); } - final Stack elementStack = new Stack(); + final Stack elementStack = new Stack<>(); final StringBuilder textBuffer = new StringBuilder(); final DefaultHandler handler = new DefaultHandler() { diff --git a/core/framework/src/main/java/org/phoebus/framework/util/ResourceParser.java b/core/framework/src/main/java/org/phoebus/framework/util/ResourceParser.java index 3559ae1b44..bbcad6c0d5 100644 --- a/core/framework/src/main/java/org/phoebus/framework/util/ResourceParser.java +++ b/core/framework/src/main/java/org/phoebus/framework/util/ResourceParser.java @@ -301,7 +301,7 @@ private static Map.Entry splitQueryParameter(final String item) final int idx = item.indexOf("="); final String key = idx > 0 ? item.substring(0, idx) : item; final String value = idx > 0 && item.length() > idx + 1 ? item.substring(idx + 1) : ""; - return new SimpleImmutableEntry(decode(key), decode(value)); + return new SimpleImmutableEntry<>(decode(key), decode(value)); } /** Decode URI text diff --git a/core/framework/src/main/java/org/phoebus/framework/workbench/ApplicationService.java b/core/framework/src/main/java/org/phoebus/framework/workbench/ApplicationService.java index 8249450255..a052dff786 100644 --- a/core/framework/src/main/java/org/phoebus/framework/workbench/ApplicationService.java +++ b/core/framework/src/main/java/org/phoebus/framework/workbench/ApplicationService.java @@ -82,7 +82,7 @@ private void registerResource(final AppResourceDescriptor app) for (String ext : app.supportedFileExtentions()) { if (!extensions.containsKey(ext)) - extensions.put(ext, new ArrayList()); + extensions.put(ext, new ArrayList<>()); extensions.get(ext).add(app); } register(app); diff --git a/core/framework/src/test/java/org/phoebus/framework/util/RingBufferUnitTest.java b/core/framework/src/test/java/org/phoebus/framework/util/RingBufferUnitTest.java index 8c6dc59acb..4426b704fb 100644 --- a/core/framework/src/test/java/org/phoebus/framework/util/RingBufferUnitTest.java +++ b/core/framework/src/test/java/org/phoebus/framework/util/RingBufferUnitTest.java @@ -22,7 +22,7 @@ public class RingBufferUnitTest @Test public void testRingBuffer() throws Exception { - final RingBuffer ring = new RingBuffer(5); + final RingBuffer ring = new RingBuffer<>(5); assertTrue(ring.isEmpty()); assertFalse(ring.isFull()); diff --git a/core/logbook/src/main/java/org/phoebus/logbook/LogEntryImpl.java b/core/logbook/src/main/java/org/phoebus/logbook/LogEntryImpl.java index eb57f265d3..b55d09be42 100644 --- a/core/logbook/src/main/java/org/phoebus/logbook/LogEntryImpl.java +++ b/core/logbook/src/main/java/org/phoebus/logbook/LogEntryImpl.java @@ -181,10 +181,10 @@ public static class LogEntryBuilder { private Instant createdDate; private Instant modifiedDate; private int version; - private Set tags = new HashSet(); - private Set logbooks = new HashSet(); - private Set properties = new HashSet(); - private Set attachments = new HashSet(); + private Set tags = new HashSet<>(); + private Set logbooks = new HashSet<>(); + private Set properties = new HashSet<>(); + private Set attachments = new HashSet<>(); public static LogEntryBuilder log(LogEntry log) { LogEntryBuilder logentryBuilder = new LogEntryBuilder(); diff --git a/core/logbook/src/main/java/org/phoebus/logbook/LogService.java b/core/logbook/src/main/java/org/phoebus/logbook/LogService.java index 5c8ab421a5..b805bc3aed 100644 --- a/core/logbook/src/main/java/org/phoebus/logbook/LogService.java +++ b/core/logbook/src/main/java/org/phoebus/logbook/LogService.java @@ -28,7 +28,7 @@ public class LogService { private LogService() { // Load available adapter factories - logFactories = new HashMap(); + logFactories = new HashMap<>(); loader = ServiceLoader.load(LogFactory.class); loader.stream().forEach(p -> { LogFactory logFactory = p.get(); diff --git a/core/pv-pva/src/main/java/org/phoebus/pv/pva/PVA_PV.java b/core/pv-pva/src/main/java/org/phoebus/pv/pva/PVA_PV.java index def16c507a..cfcd5f58ad 100644 --- a/core/pv-pva/src/main/java/org/phoebus/pv/pva/PVA_PV.java +++ b/core/pv-pva/src/main/java/org/phoebus/pv/pva/PVA_PV.java @@ -153,11 +153,7 @@ public VType get(final long timeout, final TimeUnit unit) { return PVAStructureHelper.getVType(data.get(timeout, unit), name_helper); } - catch (InterruptedException ex) - { - throw ex; - } - catch (TimeoutException ex) + catch (InterruptedException | TimeoutException ex) { throw ex; } diff --git a/core/pv-tango/src/main/java/org/phoebus/pv/tango/TangoCommandHelper.java b/core/pv-tango/src/main/java/org/phoebus/pv/tango/TangoCommandHelper.java index 1d6154dc9a..9483fbe9c9 100644 --- a/core/pv-tango/src/main/java/org/phoebus/pv/tango/TangoCommandHelper.java +++ b/core/pv-tango/src/main/java/org/phoebus/pv/tango/TangoCommandHelper.java @@ -488,7 +488,7 @@ public static List extractList(final Class type, final Object value) t * @return A {@link List}. */ public static List extractList(@SuppressWarnings("unchecked") final T... value) { - final List result = new ArrayList(); + final List result = new ArrayList<>(); for (T val : value) { result.add(val); } diff --git a/core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java b/core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java index c9333d91d9..7efbc9bc7e 100644 --- a/core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java +++ b/core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java @@ -768,7 +768,7 @@ void createLoadLayoutsMenu() { final List addLayoutMenuItemList = new ArrayList<>(); final List toolbarAddLayoutMenuItemList = new ArrayList<>(); - final Map layoutFiles = new HashMap(); + final Map layoutFiles = new HashMap<>(); // Get every file in the default directory. final File dir = new File(Locations.user().getAbsolutePath()); diff --git a/core/ui/src/main/java/org/phoebus/ui/docking/DockItem.java b/core/ui/src/main/java/org/phoebus/ui/docking/DockItem.java index 8c3629cfdf..10356b3e25 100644 --- a/core/ui/src/main/java/org/phoebus/ui/docking/DockItem.java +++ b/core/ui/src/main/java/org/phoebus/ui/docking/DockItem.java @@ -269,7 +269,7 @@ else if (stagesContainingActiveDockPane.size() == 0) { }); close = new MenuItem(Messages.DockClose, new ImageView(DockPane.close_icon)); - ArrayList arrayList = new ArrayList(); + ArrayList arrayList = new ArrayList<>(); arrayList.add(this); close.setOnAction(event -> close(arrayList)); diff --git a/core/ui/src/main/java/org/phoebus/ui/javafx/EditCell.java b/core/ui/src/main/java/org/phoebus/ui/javafx/EditCell.java index 06fc8c74b4..70124f2a4b 100644 --- a/core/ui/src/main/java/org/phoebus/ui/javafx/EditCell.java +++ b/core/ui/src/main/java/org/phoebus/ui/javafx/EditCell.java @@ -59,7 +59,7 @@ public EditCell(StringConverter converter) { /** * Convenience converter that does nothing (converts Strings to themselves and vice-versa...). */ - public static final StringConverter IDENTITY_CONVERTER = new StringConverter() { + public static final StringConverter IDENTITY_CONVERTER = new StringConverter<>() { @Override public String toString(String object) { @@ -78,7 +78,7 @@ public String fromString(String string) { * @return the edit cell */ public static EditCell createStringEditCell() { - return new EditCell(IDENTITY_CONVERTER); + return new EditCell<>(IDENTITY_CONVERTER); } // set the text of the text field and display the graphic @@ -108,9 +108,9 @@ public void commitEdit(T item) { TableView table = getTableView(); if (table != null) { TableColumn column = getTableColumn(); - CellEditEvent event = new CellEditEvent(table, - new TablePosition(table, getIndex(), column), - TableColumn.editCommitEvent(), item); + CellEditEvent event = new CellEditEvent<>(table, + new TablePosition<>(table, getIndex(), column), + TableColumn.editCommitEvent(), item); Event.fireEvent(column, event); } } diff --git a/core/ui/src/main/java/org/phoebus/ui/javafx/LineNumberTableCellFactory.java b/core/ui/src/main/java/org/phoebus/ui/javafx/LineNumberTableCellFactory.java index 9de6f4e77b..3f4b6a0167 100644 --- a/core/ui/src/main/java/org/phoebus/ui/javafx/LineNumberTableCellFactory.java +++ b/core/ui/src/main/java/org/phoebus/ui/javafx/LineNumberTableCellFactory.java @@ -38,20 +38,19 @@ public LineNumberTableCellFactory ( boolean startFromZero ) { @Override public TableCell call ( TableColumn param ) { - return new TableCell() { + return new TableCell<>() { - /* Instance initializer. */ - { + /* Instance initializer. */ { setAlignment(Pos.CENTER_LEFT); } @Override - protected void updateItem ( E item, boolean empty ) { + protected void updateItem(E item, boolean empty) { super.updateItem(item, empty); - if ( !empty ) { - setText(String.valueOf(getTableRow().getIndex() + ( startFromZero ? 0 : 1 ))); + if (!empty) { + setText(String.valueOf(getTableRow().getIndex() + (startFromZero ? 0 : 1))); } else { setText(""); } diff --git a/core/ui/src/main/java/org/phoebus/ui/undo/SizeLimitedStack.java b/core/ui/src/main/java/org/phoebus/ui/undo/SizeLimitedStack.java index 9d74ec714d..ac33b3461e 100644 --- a/core/ui/src/main/java/org/phoebus/ui/undo/SizeLimitedStack.java +++ b/core/ui/src/main/java/org/phoebus/ui/undo/SizeLimitedStack.java @@ -21,7 +21,7 @@ public class SizeLimitedStack { final private int limit; - final private LinkedList list = new LinkedList(); + final private LinkedList list = new LinkedList<>(); /**@param limit Maximum number of stack elements */ public SizeLimitedStack(final int limit) diff --git a/core/ui/src/main/java/org/phoebus/ui/undo/UndoableActionManager.java b/core/ui/src/main/java/org/phoebus/ui/undo/UndoableActionManager.java index 6cc01406af..85d299347c 100644 --- a/core/ui/src/main/java/org/phoebus/ui/undo/UndoableActionManager.java +++ b/core/ui/src/main/java/org/phoebus/ui/undo/UndoableActionManager.java @@ -38,8 +38,8 @@ public class UndoableActionManager /** @param stack_size Number of undo/redo entries */ public UndoableActionManager(final int stack_size) { - undoStack = new SizeLimitedStack(stack_size); - redoStack = new SizeLimitedStack(stack_size); + undoStack = new SizeLimitedStack<>(stack_size); + redoStack = new SizeLimitedStack<>(stack_size); } /** @param listener Listener to add */ diff --git a/core/util/src/main/java/org/phoebus/util/MimeTypeDetector.java b/core/util/src/main/java/org/phoebus/util/MimeTypeDetector.java index 9db92cd2de..21320ccc3b 100644 --- a/core/util/src/main/java/org/phoebus/util/MimeTypeDetector.java +++ b/core/util/src/main/java/org/phoebus/util/MimeTypeDetector.java @@ -5,43 +5,32 @@ package org.phoebus.util; import org.apache.tika.Tika; -import org.apache.tika.metadata.Metadata; +import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.util.logging.Level; import java.util.logging.Logger; public class MimeTypeDetector { /** - * Attempts to determine the file type based on its content. Cleverness delegated to Apache Tika. - *

- * Note that the {@link InputStream} will be closed by this method. - *

+ * Attempts to determine the file type based on its content and name. Cleverness delegated to Apache Tika. * - * @param inputStream A non-null {@link InputStream} that will be closed by this method. + * @param file A non-null {@link File} to inspect. * @return A MIME type string, e.g. image/jpeg - * @throws IOException If there is a problem reading the stream or if the provided {@link InputStream} is + * @throws IOException If there is a problem reading the file or if the provided {@link File} is * null. */ - public static String determineMimeType(InputStream inputStream) throws IOException { - if (inputStream == null) { - throw new IOException("InputStream must not be null"); + public static String determineMimeType(File file) throws IOException { + if (file == null) { + throw new IOException("File must not be null"); } try { - return new Tika().detect(inputStream, new Metadata()); + return new Tika().detect(file); } catch (IOException e) { Logger.getLogger(MimeTypeDetector.class.getName()) - .log(Level.WARNING, "Unable to read input stream", e); + .log(Level.WARNING, "Unable to determine MIME type of " + file, e); throw e; - } finally { - try { - inputStream.close(); - } catch (IOException e) { - Logger.getLogger(MimeTypeDetector.class.getName()) - .log(Level.WARNING, "Failed to close input stream", e); - } } } } diff --git a/core/util/src/test/java/org/phoebus/util/MimeTypeDetectorTest.java b/core/util/src/test/java/org/phoebus/util/MimeTypeDetectorTest.java index b1247c3761..897583f6cc 100644 --- a/core/util/src/test/java/org/phoebus/util/MimeTypeDetectorTest.java +++ b/core/util/src/test/java/org/phoebus/util/MimeTypeDetectorTest.java @@ -6,42 +6,43 @@ import org.junit.jupiter.api.Test; +import java.io.File; import java.io.IOException; +import java.net.URISyntaxException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; public class MimeTypeDetectorTest { + private static File resource(String name) throws URISyntaxException { + return new File(MimeTypeDetector.class.getResource(name).toURI()); + } + @Test public void testHeic() throws Exception { assertEquals("image/heic", - MimeTypeDetector - .determineMimeType(MimeTypeDetector.class.getResourceAsStream("ios_original.HEIC"))); + MimeTypeDetector.determineMimeType(resource("ios_original.HEIC"))); assertEquals("image/heic", - MimeTypeDetector - .determineMimeType(MimeTypeDetector.class.getResourceAsStream("ios_heic_converted.JPEG"))); + MimeTypeDetector.determineMimeType(resource("ios_heic_converted.JPEG"))); } @Test public void testJpeg() throws Exception { assertEquals("image/jpeg", - MimeTypeDetector - .determineMimeType(MimeTypeDetector.class.getResourceAsStream("proper_jpeg.jpeg"))); + MimeTypeDetector.determineMimeType(resource("proper_jpeg.jpeg"))); } @Test public void testPdf() throws Exception { assertEquals("application/pdf", - MimeTypeDetector - .determineMimeType(MimeTypeDetector.class.getResourceAsStream("mimetest.pdf"))); + MimeTypeDetector.determineMimeType(resource("mimetest.pdf"))); } @Test - public void testNullInputStream() { + public void testNullFile() { assertThrows(IOException.class, () -> - MimeTypeDetector - .determineMimeType(MimeTypeDetector.class.getResourceAsStream("does_no_exist"))); + MimeTypeDetector.determineMimeType(null)); } } diff --git a/services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java b/services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java index 3d486eb269..2c87b0ad59 100644 --- a/services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java +++ b/services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java @@ -153,8 +153,8 @@ private void initialize() { } writeAlarmModel(); - try (Consumer consumer = new KafkaConsumer(props, - Serdes.String().deserializer(), Serdes.String().deserializer());) { + try (Consumer consumer = new KafkaConsumer<>(props, + Serdes.String().deserializer(), Serdes.String().deserializer());) { // Rewind whenever assigned to partition final ConsumerRebalanceListener crl = new ConsumerRebalanceListener() { @@ -192,7 +192,7 @@ public void run() { StreamsBuilder builder = new StreamsBuilder(); KStream alarms = builder.stream(topic, Consumed.with(Serdes.String(), Serdes.String())); - alarms.process(new ProcessorSupplier() { + alarms.process(new ProcessorSupplier<>() { @Override public Processor get() { return new ProcessAlarmConfigMessage(); diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java index 3a1ab27433..4d846a33db 100644 --- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java +++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmCmdLogger.java @@ -62,7 +62,7 @@ public AlarmCmdLogger(String topic) throws Exception { super(); this.topic = topic; - MessageParser messageParser = new MessageParser(AlarmCommandMessage.class); + MessageParser messageParser = new MessageParser<>(AlarmCommandMessage.class); alarmCommandMessageSerde = Serdes.serdeFrom(messageParser, messageParser); // Read reconnect delay from system property, default to 30 seconds @@ -160,12 +160,13 @@ public long extract(ConsumerRecord record, long previousTimestam } })); - KStream timeStampedAlarms = alarms.transform(new TransformerSupplier>() { + KStream timeStampedAlarms = alarms.transform(new TransformerSupplier<>() { @Override public Transformer> get() { - return new Transformer>() { + return new Transformer<>() { private ProcessorContext context; + @Override public void init(ProcessorContext context) { this.context = context; @@ -176,14 +177,14 @@ public KeyValue transform(String key, AlarmCommandM key = key.replace("\\", ""); value.setConfig(key); value.setMessage_time(Instant.ofEpochMilli(context.timestamp())); - return new KeyValue(key, value); + return new KeyValue<>(key, value); } @Override public void close() { - + } - + }; } }); diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java index 8e29dc51e5..05b9ec115e 100644 --- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java +++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmMessageLogger.java @@ -184,7 +184,7 @@ public long extract(ConsumerRecord record, long previousTimestam // logger.config("Processing alarm message with key : " + key != null ? key // : "null" + " " + value != null ? value.toString() : "null"); value.setKey(key); - return new KeyValue(key, value); + return new KeyValue<>(key, value); }); alarms.split(Named.as("alarm-")) @@ -253,7 +253,7 @@ public long extract(ConsumerRecord record, long previousTimestam private void processAlarmStateStream(KStream alarmStateBranch) { KStream transformedAlarms = alarmStateBranch - .transform(new TransformerSupplier>() { + .transform(new TransformerSupplier<>() { @Override public Transformer> get() { @@ -301,12 +301,13 @@ public void close() { } private void processAlarmConfigurationStream(KStream alarmConfigBranch) { - KStream alarmConfigMessages = alarmConfigBranch.transform(new TransformerSupplier>() { + KStream alarmConfigMessages = alarmConfigBranch.transform(new TransformerSupplier<>() { @Override public Transformer> get() { - return new Transformer>() { + return new Transformer<>() { private ProcessorContext context; + @Override public void init(ProcessorContext context) { this.context = context; @@ -314,13 +315,13 @@ public void init(ProcessorContext context) { @Override public KeyValue transform(String key, AlarmMessage value) { - + key = key.replace("\\", ""); - if(value != null) { + if (value != null) { AlarmConfigMessage newValue = value.getAlarmConfigMessage(); newValue.setConfig(key); newValue.setMessage_time(Instant.ofEpochMilli(context.timestamp())); - return new KeyValue(key, newValue); + return new KeyValue<>(key, newValue); } else { return null; } @@ -328,9 +329,9 @@ public KeyValue transform(String key, AlarmMessage v @Override public void close() { - + } - + }; } }); diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/SearchController.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/SearchController.java index 771a594186..557115bfb6 100644 --- a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/SearchController.java +++ b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/SearchController.java @@ -55,11 +55,11 @@ public class SearchController { @GetMapping public String info() { - Map alarmLoggingServiceInfo = new LinkedHashMap(); + Map alarmLoggingServiceInfo = new LinkedHashMap<>(); alarmLoggingServiceInfo.put("name", "Alarm logging Service"); alarmLoggingServiceInfo.put("version", version); - Map elasticInfo = new LinkedHashMap(); + Map elasticInfo = new LinkedHashMap<>(); try { ElasticsearchClient client = ElasticClientHelper.getInstance().getClient(); InfoResponse response = client.info(); diff --git a/services/alarm-server/src/main/java/org/phoebus/applications/alarm/server/AlarmServerMain.java b/services/alarm-server/src/main/java/org/phoebus/applications/alarm/server/AlarmServerMain.java index 0de566582a..2366dbbbaf 100644 --- a/services/alarm-server/src/main/java/org/phoebus/applications/alarm/server/AlarmServerMain.java +++ b/services/alarm-server/src/main/java/org/phoebus/applications/alarm/server/AlarmServerMain.java @@ -503,7 +503,7 @@ public static void main(final String[] original_args) throws Exception { // Handle arguments final List args = new ArrayList<>(List.of(original_args)); final Iterator iter = args.iterator(); - HashMap parsed_args = new HashMap(); + HashMap parsed_args = new HashMap<>(); try { // define command line arguments String help_arg = "-help"; diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/command/IncludeCommandImpl.java b/services/scan-server/src/main/java/org/csstudio/scan/server/command/IncludeCommandImpl.java index 6c3db4bd49..330c639870 100644 --- a/services/scan-server/src/main/java/org/csstudio/scan/server/command/IncludeCommandImpl.java +++ b/services/scan-server/src/main/java/org/csstudio/scan/server/command/IncludeCommandImpl.java @@ -72,7 +72,7 @@ public String[] getDeviceNames(final MacroContext macros) throws Exception macros.pushMacros(command.getMacros()); try { - final Set devices = new HashSet(); + final Set devices = new HashSet<>(); for (ScanCommandImpl command : scan_impl) { for (String device_name : command.getDeviceNames(macros)) diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/command/LoopCommandImpl.java b/services/scan-server/src/main/java/org/csstudio/scan/server/command/LoopCommandImpl.java index dd711a58a7..37ad7ebb68 100644 --- a/services/scan-server/src/main/java/org/csstudio/scan/server/command/LoopCommandImpl.java +++ b/services/scan-server/src/main/java/org/csstudio/scan/server/command/LoopCommandImpl.java @@ -98,7 +98,7 @@ public long getWorkUnits() public String[] getDeviceNames(final MacroContext macros) throws Exception { final String device_name = command.getDeviceName(); - final Set device_names = new HashSet(); + final Set device_names = new HashSet<>(); device_names.add(macros.resolveMacros(device_name)); if (command.getWait() && command.getReadback().length() > 0) device_names.add(macros.resolveMacros(command.getReadback())); diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/command/SequenceCommandImpl.java b/services/scan-server/src/main/java/org/csstudio/scan/server/command/SequenceCommandImpl.java index ef0e7b9f04..83f81e1a9a 100644 --- a/services/scan-server/src/main/java/org/csstudio/scan/server/command/SequenceCommandImpl.java +++ b/services/scan-server/src/main/java/org/csstudio/scan/server/command/SequenceCommandImpl.java @@ -66,7 +66,7 @@ public long getWorkUnits() @Override public String[] getDeviceNames(final MacroContext macros) throws Exception { - final Set device_names = new HashSet(); + final Set device_names = new HashSet<>(); for (ScanCommandImpl command : implementation) { final String[] names = command.getDeviceNames(macros); diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLog.java b/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLog.java index 1e94f94360..35f13b8613 100644 --- a/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLog.java +++ b/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLog.java @@ -32,14 +32,8 @@ public DerbyDataLog(final long scan_id) throws Exception { this.scan_id = scan_id; // Initialize sample serial - final RDBDataLogger logger = new DerbyDataLogger(); - try - { - last_serial = logger.getLastScanDataSerial(scan_id); - } - finally - { - logger.close(); + try (RDBDataLogger derbyDataLogger = new DerbyDataLogger()) { + last_serial = derbyDataLogger.getLastScanDataSerial(scan_id); } } @@ -57,14 +51,8 @@ public void doLog(final String device, final ScanSample sample) throws Exception public ScanData getScanData() throws Exception { // Can be called without doLog(), so use separate logger just for this call - final RDBDataLogger logger = new DerbyDataLogger(); - try - { - return logger.getScanData(scan_id); - } - finally - { - logger.close(); + try (RDBDataLogger derbyDataLogger = new DerbyDataLogger()) { + return derbyDataLogger.getScanData(scan_id); } } diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLogger.java b/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLogger.java index f8ac3754ad..7cc7e6c02a 100644 --- a/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLogger.java +++ b/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/DerbyDataLogger.java @@ -62,16 +62,10 @@ public static void startup(final String location) throws Exception // then newInstance is required to re-start. Class.forName(DERBY_DRIVER).getDeclaredConstructor().newInstance(); - final DerbyDataLogger database = new DerbyDataLogger(); - try - { - if (! database.haveTables()) + try (DerbyDataLogger database = new DerbyDataLogger()) { + if (!database.haveTables()) database.createTables(); } - finally - { - database.close(); - } // Start network data server programmatically // final int port = Preferences.getServerPort(); @@ -107,22 +101,14 @@ protected Connection connect() throws Exception */ private boolean haveTables() throws SQLException { - final Statement statement = connection.createStatement(); - try - { + try (Statement statement = connection.createStatement()) { statement.executeQuery("SELECT * FROM scans WHERE id=1"); return true; - } - catch (SQLException ex) - { + } catch (SQLException ex) { if ("42X05".equals(ex.getSQLState())) return false; throw ex; } - finally - { - statement.close(); - } } /** Create database tables @@ -130,53 +116,39 @@ private boolean haveTables() throws SQLException */ private void createTables() throws Exception { - final Statement statement = connection.createStatement(); - try - { + try (Statement statement = connection.createStatement()) { logger.info("Creating new database tables"); final BufferedReader reader = new BufferedReader( - new InputStreamReader(getClass().getResourceAsStream("/config/scanlog.dbd") ) - ); + new InputStreamReader(getClass().getResourceAsStream("/config/scanlog.dbd")) + ); StringBuilder cmd = new StringBuilder(); String line = reader.readLine(); - while (line != null) - { + while (line != null) { line = line.trim(); // Skip comments - if (! line.startsWith("--")) - { - if (line.endsWith(";")) - { // Found end of command - cmd.append(line.substring(0, line.length()-1)); - if (cmd.length() > 0) - { + if (!line.startsWith("--")) { + if (line.endsWith(";")) { // Found end of command + cmd.append(line, 0, line.length() - 1); + if (!cmd.isEmpty()) { final String sql = cmd.toString(); - try - { + try { statement.execute(sql); - } - catch (SQLException ex) - { + } catch (SQLException ex) { // Ignore RROR 42Y55: 'DROP TABLE' cannot be performed on '...' because it does not exist. - if (! ex.getSQLState().equals("42Y55")) + if (!ex.getSQLState().equals("42Y55")) logger.log(Level.INFO, "SQL failed: " + sql, ex); } } cmd = new StringBuilder(); - } - else + } else cmd.append(line); } line = reader.readLine(); } reader.close(); } - finally - { - statement.close(); - } } /** Shut down database. diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/RDBDataLogger.java b/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/RDBDataLogger.java index 6fdbf90123..1ee5398356 100644 --- a/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/RDBDataLogger.java +++ b/services/scan-server/src/main/java/org/csstudio/scan/server/log/derby/RDBDataLogger.java @@ -42,7 +42,7 @@ abstract public class RDBDataLogger implements AutoCloseable final protected Connection connection; /** Device ID cache */ - final private Map devices = new HashMap(); + final private Map devices = new HashMap<>(); /** Re-used statement */ private PreparedStatement insert_sample_statement = null; @@ -110,18 +110,12 @@ public Scan createScan(String scan_name) throws Exception statement.setString(1, scan_name); statement.setTimestamp(2, Timestamp.from(now)); statement.executeUpdate(); - final ResultSet result = statement.getGeneratedKeys(); - try - { - if (! result.next()) + try (ResultSet result = statement.getGeneratedKeys()) { + if (!result.next()) throw new Exception("Missing new scan ID"); final long id = result.getLong(1); return new Scan(id, scan_name, now); } - finally - { - result.close(); - } } } @@ -158,7 +152,7 @@ public Scan getScan(final long id) throws Exception */ public List getScans() throws Exception { - final List scans = new ArrayList(); + final List scans = new ArrayList<>(); try ( final PreparedStatement statement = connection.prepareStatement( @@ -203,19 +197,13 @@ public int getDevice(final String device_name) throws Exception { statement.setString(1, device_name); statement.executeUpdate(); - final ResultSet result = statement.getGeneratedKeys(); - try - { - if (! result.next()) + try (ResultSet result = statement.getGeneratedKeys()) { + if (!result.next()) throw new Exception("Missing new device ID"); id = result.getInt(1); devices.put(device_name, id); return id; } - finally - { - result.close(); - } } } @@ -233,17 +221,11 @@ private int findDevice(final String device_name) throws SQLException ) { statement.setString(1, device_name); - final ResultSet result = statement.executeQuery(); - try - { - if (! result.next()) + try (ResultSet result = statement.executeQuery()) { + if (!result.next()) return -1; return result.getInt(1); } - finally - { - result.close(); - } } } @@ -313,7 +295,7 @@ public long getLastScanDataSerial(final long scan_id) throws Exception */ public ScanData getScanData(final long scan_id) throws Exception { - final Map> device_logs = new HashMap>(); + final Map> device_logs = new HashMap<>(); // Could fetch all samples for scan ID, but // organizing the retrieval by device in case @@ -336,7 +318,7 @@ public ScanData getScanData(final long scan_id) throws Exception */ private List getScanSamples(final long scan_id, final String device_name) throws Exception { - final List samples = new ArrayList(); + final List samples = new ArrayList<>(); try ( final PreparedStatement statement = connection.prepareStatement( @@ -365,7 +347,7 @@ private List getScanSamples(final long scan_id, final String device_ */ private String[] getScanDevices(final long scan_id) throws SQLException { - final List devices = new ArrayList(); + final List scanDevices = new ArrayList<>(); try ( final PreparedStatement statement = connection.prepareStatement( @@ -375,10 +357,10 @@ private String[] getScanDevices(final long scan_id) throws SQLException statement.setLong(1, scan_id); final ResultSet result = statement.executeQuery(); while (result.next()) - devices.add(result.getString(1)); + scanDevices.add(result.getString(1)); result.close(); } - return devices.toArray(new String[devices.size()]); + return scanDevices.toArray(new String[scanDevices.size()]); } /** Delete logged data for a scan