You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2012/10/19 15:56:04 UTC
svn commit: r1400098 - in
/felix/trunk/configadmin/src/main/java/org/apache/felix/cm:
file/FilePersistenceManager.java impl/ConfigurationAdapter.java
impl/ConfigurationImpl.java impl/helper/BaseTracker.java
Author: fmeschbe
Date: Fri Oct 19 13:56:03 2012
New Revision: 1400098
URL: http://svn.apache.org/viewvc?rev=1400098&view=rev
Log:
Fix JavaDoc warnings
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/FilePersistenceManager.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/FilePersistenceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/FilePersistenceManager.java?rev=1400098&r1=1400097&r2=1400098&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/FilePersistenceManager.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/file/FilePersistenceManager.java Fri Oct 19 13:56:03 2012
@@ -81,7 +81,7 @@ import org.osgi.framework.Constants;
* <b>Mulithreading Issues</b>
* <p>
* In a multithreaded environment the {@link #store(String, Dictionary)} and
- * {@link #load(File)} methods may be called at the the quasi-same time for the
+ * {@link #load(String)} methods may be called at the the quasi-same time for the
* same configuration PID. It may no happen, that the store method starts
* writing the file and the load method might at the same time read from the
* file currently being written and thus loading corrupt data (if data is
@@ -94,7 +94,7 @@ import org.osgi.framework.Constants;
* with file extension <code>.tmp</code>. When done, the file is renamed to
* actual configuration file name as implied by the PID. This last step of
* renaming the file is synchronized on the FilePersistenceManager instance.</li>
- * <li>The {@link #load(File)} method is completeley synchronized on the
+ * <li>The {@link #load(String)} method is completeley synchronized on the
* FilePersistenceManager instance such that the {@link #store} method might
* inadvertantly try to replace the file while it is being read.</li>
* <li>Finally the <code>Iterator</code> returned by {@link #getDictionaries()}
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1400098&r1=1400097&r2=1400098&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java Fri Oct 19 13:56:03 2012
@@ -84,7 +84,7 @@ public class ConfigurationAdapter implem
/**
* @param bundleLocation
- * @see org.apache.felix.cm.impl.ConfigurationImpl#setBundleLocation(java.lang.String)
+ * @see org.apache.felix.cm.impl.ConfigurationImpl#setStaticBundleLocation(String)
*/
public void setBundleLocation( String bundleLocation )
{
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java?rev=1400098&r1=1400097&r2=1400098&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java Fri Oct 19 13:56:03 2012
@@ -319,7 +319,7 @@ public class ConfigurationImpl extends C
*
* @param deepCopy
* <code>true</code> if a deep copy is to be returned.
- * @return
+ * @return the configuration properties
*/
public Dictionary getProperties( boolean deepCopy )
{
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java?rev=1400098&r1=1400097&r2=1400098&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java Fri Oct 19 13:56:03 2012
@@ -173,8 +173,8 @@ public abstract class BaseTracker<S> ext
* @param configurationMap The PID to configuration map for PIDs
* used by the service to update
*
- * @see {@link ManagedServiceTracker#provideConfiguration(ServiceReference, TargetedPID, TargetedPID, Dictionary, long)}
- * @see {@link ManagedServiceFactoryTracker#provideConfiguration(ServiceReference, TargetedPID, TargetedPID, Dictionary, long)}
+ * @see ManagedServiceTracker#provideConfiguration(ServiceReference, TargetedPID, TargetedPID, Dictionary, long, ConfigurationMap)
+ * @see ManagedServiceFactoryTracker#provideConfiguration(ServiceReference, TargetedPID, TargetedPID, Dictionary, long, ConfigurationMap)
*/
public abstract void provideConfiguration( ServiceReference<S> service, TargetedPID configPid,
TargetedPID factoryPid, Dictionary<String, ?> properties, long revision,