Skip to content
Snippets Groups Projects

Fixing JAXB and javadoc to make it work in Java 1.8.

Merged Anders Harrisson requested to merge Development into master
76 files
+ 1456
1228
Compare changes
  • Side-by-side
  • Inline
Files
76
@@ -68,8 +68,10 @@ public class CachedPVProvider {
* Returns a PV connection by the specified name from cache or creates a new one, if on does not
* already exist. Returned PV is already connected.
*
* @see PV#blockUntilFirstUpdate(int)
* @param pvName name of the PV
*
* @param waitForValue if true the calling thread will be blocked, until the PV receives the first
* value, but no longer than 2 seconds
* @return PV by the specified name
*
* @throws PVException if there is a problem connecting the PV or parameter is null
@@ -85,7 +87,6 @@ public class CachedPVProvider {
pv = pvFactory.createPV(pvName);
pv.start();
pvMap.put(pvName, pv);
}
}
if (waitForValue) {
@@ -105,7 +106,7 @@ public class CachedPVProvider {
* @throws PVException if there is a problem connecting the PV or parameter is null
*/
public PV getPV(String pvName) throws PVException {
return getPV(pvName,true);
return getPV(pvName,true);
}
@XmlRootElement(name = "autoconnect")
Loading