[libbluray-devel] Cosmetics
hpi1
git at videolan.org
Mon Sep 24 00:45:10 CEST 2012
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Mon Sep 24 01:02:55 2012 +0300| [e34f5e2661c724e5046dce577af3494ef21b9738] | committer: hpi1
Cosmetics
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=e34f5e2661c724e5046dce577af3494ef21b9738
---
.../bdj/java/javax/tv/locator/LocatorFactory.java | 19 ++++++++-----------
.../bdj/java/javax/tv/locator/LocatorImpl.java | 18 ++++++------------
.../java/javax/tv/media/MediaSelectPermission.java | 18 ++++++++----------
.../tv/service/selection/ServiceContextFactory.java | 6 ++----
4 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java b/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java
index 0f99070..375c148 100644
--- a/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java
+++ b/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java
@@ -19,21 +19,18 @@
package javax.tv.locator;
-public abstract class LocatorFactory extends Object
-{
- protected LocatorFactory()
- {
+public abstract class LocatorFactory extends Object {
+ protected LocatorFactory() {
- }
+ }
- public static LocatorFactory getInstance()
- {
- return instance;
- }
+ public static LocatorFactory getInstance() {
+ return instance;
+ }
- public abstract Locator createLocator(String locatorString) throws MalformedLocatorException;
+ public abstract Locator createLocator(String locatorString) throws MalformedLocatorException;
- public abstract Locator[] transformLocator( Locator source) throws InvalidLocatorException;
+ public abstract Locator[] transformLocator( Locator source) throws InvalidLocatorException;
private static final LocatorFactory instance = new LocatorFactoryImpl();
}
diff --git a/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java b/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java
index 7c3ef60..e14825c 100644
--- a/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java
+++ b/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java
@@ -24,32 +24,26 @@ public class LocatorImpl implements Locator {
this.url = url;
}
-
-
- public boolean hasMultipleTransformations()
- {
+ public boolean hasMultipleTransformations() {
return false;
}
- public String toExternalForm()
- {
+ public String toExternalForm() {
return url;
}
-
+
public String toString() {
return toExternalForm();
}
- public int hashCode()
- {
+ public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((url == null) ? 0 : url.hashCode());
return result;
}
- public boolean equals(Object obj)
- {
+ public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
@@ -64,6 +58,6 @@ public class LocatorImpl implements Locator {
return false;
return true;
}
-
+
private String url;
}
diff --git a/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java b/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java
index 8f03473..b863d23 100644
--- a/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java
+++ b/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java
@@ -26,17 +26,17 @@ import java.io.Serializable;
public final class MediaSelectPermission extends Permission
implements Serializable
{
- public MediaSelectPermission(Locator locator) {
+ public MediaSelectPermission(Locator locator) {
super(locator.toExternalForm());
-
+
this.locator = locator.toExternalForm();
}
- public MediaSelectPermission(String locator, String actions) {
+ public MediaSelectPermission(String locator, String actions) {
super(locator);
-
+
this.locator = locator;
-
+
if (actions != null)
assert false; // should never happen
}
@@ -46,8 +46,7 @@ public final class MediaSelectPermission extends Permission
}
@Override
- public boolean equals(Object obj)
- {
+ public boolean equals(Object obj) {
if (this == obj)
return true;
if (getClass() != obj.getClass())
@@ -62,8 +61,7 @@ public final class MediaSelectPermission extends Permission
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
final int prime = 31;
int result = prime + ((locator == null) ? 0 : locator.hashCode());
return result;
@@ -72,7 +70,7 @@ public final class MediaSelectPermission extends Permission
public String getActions() {
return "";
}
-
+
private String locator;
private static final long serialVersionUID = 128534275081685853L;
}
diff --git a/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java b/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java
index bea362c..fac676f 100644
--- a/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java
+++ b/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java
@@ -20,12 +20,10 @@
package javax.tv.service.selection;
public abstract class ServiceContextFactory {
- protected ServiceContextFactory()
- {
+ protected ServiceContextFactory() {
}
- public static ServiceContextFactory getInstance()
- {
+ public static ServiceContextFactory getInstance() {
return instance;
}
More information about the libbluray-devel
mailing list