Skip to content

Commit

Permalink
Wrong constant name, fixes, 4thline#98
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Bauer committed Oct 21, 2014
1 parent 10805c1 commit 1f1df72
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Combines a {@link org.fourthline.cling.model.types.UDN} and a {@link org.fourthline.cling.model.types.ServiceId}.
* <p>
* A service reference is useful to remember a service. For example, if a control point has accessed
* a service one, it can remember the service with {@link org.fourthline.cling.model.meta.Service#getReference()}.
* a service once, it can remember the service with {@link org.fourthline.cling.model.meta.Service#getReference()}.
* Before every action invocation, it can now resolve the reference to an actually registered service with
* {@link org.fourthline.cling.registry.Registry#getService(ServiceReference)}. If the registry doesn't return
* a service for the given reference, the service is currently not available.
Expand Down
13 changes: 7 additions & 6 deletions core/src/main/java/org/fourthline/cling/registry/Registry.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public interface Registry {
/**
* Typically called internally when the UPnP stack is stopping.
* <p>
* Unsubscribes all local devices and GENA subscriptions.
* Unsubscribe all local devices and GENA subscriptions.
* </p>
*/
public void shutdown();
Expand Down Expand Up @@ -161,7 +161,7 @@ public interface Registry {
* Called internally by the UPnP stack when the discovery protocol starts.
* <p>
* The registry will notify all registered listeners of this event, unless the
* given device was already been present in the registry.
* given device was already in the registry.
* </p>
*
* @param device The half-hydrated (without services) metadata of the discovered device.
Expand All @@ -170,7 +170,7 @@ public interface Registry {
public boolean notifyDiscoveryStart(RemoteDevice device);

/**
* Called internally by the UPnP stack when the discovery protocol stopped abnormaly.
* Called internally by the UPnP stack when the discovery protocol stopped abnormally.
* <p>
* The registry will notify all registered listeners of this event.
* </p>
Expand Down Expand Up @@ -303,7 +303,7 @@ public interface Registry {
public Collection<Device> getDevices(ServiceType serviceType);

/**
* @return Complete service metadata.for a service reference or <code>null</code> if no service
* @return Complete service metadata for a service reference or <code>null</code> if no service
* for the given reference has been registered.
*/
public Service getService(ServiceReference serviceReference);
Expand Down Expand Up @@ -431,8 +431,9 @@ public interface Registry {
* Called internally by the UPnP stack, during GENA protocol execution.
* <p>
* Get a remote subscription from its subscriptionId. If the subscription can't be found,
* wait for one of pending remote subscription procedures to terminate, until the subscription
* has been found or until there are no more pending subscription procedures.
* wait for one of the pending remote subscription procedures from the registry background
* maintainer to terminate, until the subscription has been found or until there are no
* more pending subscription procedures.
* </p>
*/
public RemoteGENASubscription getWaitRemoteSubscription(String subscriptionId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -504,7 +503,7 @@ public void printDebugLog() {
}

}

@Override
public void registerPendingRemoteSubscription(RemoteGENASubscription subscription) {
synchronized (pendingSubscriptionsLock) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public enum TransportStatus {

OK,
ERROR_OCCURED,
ERROR_OCCURRED,
CUSTOM;

String value;
Expand Down

0 comments on commit 1f1df72

Please sign in to comment.