Petri Hintukainen pushed to branch master at VideoLAN / libbluray
Commits:
4dfb9b01 by Petri Hintukainen at 2026-01-30T19:21:44+02:00
BD-J: HAVI: use default look store
- - - - -
8 changed files:
- src/libbluray/bdj/java/org/havi/ui/HAnimation.java
- src/libbluray/bdj/java/org/havi/ui/HListGroup.java
- src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java
- src/libbluray/bdj/java/org/havi/ui/HRange.java
- src/libbluray/bdj/java/org/havi/ui/HRangeValue.java
- src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java
- src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java
- src/libbluray/bdj/java/org/havi/ui/HStaticRange.java
Changes:
=====================================
src/libbluray/bdj/java/org/havi/ui/HAnimation.java
=====================================
@@ -23,6 +23,7 @@ import java.awt.Image;
import org.havi.ui.event.HFocusEvent;
import org.havi.ui.event.HFocusListener;
+import org.videolan.BDJXletContext;
import org.videolan.Logger;
public class HAnimation extends HStaticAnimation implements HNavigable {
@@ -53,13 +54,11 @@ public class HAnimation extends HStaticAnimation implements
HNavigable {
}
public static void setDefaultLook(HAnimateLook hlook) {
- DefaultLook = hlook;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, hlook);
}
public static HAnimateLook getDefaultLook() {
- if (DefaultLook == null)
- logger.unimplemented("getDefaultLook");
- return DefaultLook;
+ return (HAnimateLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,
DEFAULT_LOOK);
}
public void setMove(int keyCode, HNavigable target) {
@@ -116,7 +115,8 @@ public class HAnimation extends HStaticAnimation implements
HNavigable {
logger.unimplemented("");
}
- private static HAnimateLook DefaultLook = null;
+ private static final Class DEFAULT_LOOK = HAnimateLook.class;
+ private static final String PROPERTY_LOOK = HAnimation.class.getName();
private static final Logger logger =
Logger.getLogger(HAnimation.class.getName());
=====================================
src/libbluray/bdj/java/org/havi/ui/HListGroup.java
=====================================
@@ -24,6 +24,8 @@ import org.havi.ui.event.HFocusEvent;
import org.havi.ui.event.HFocusListener;
import org.havi.ui.event.HItemEvent;
+import org.videolan.BDJXletContext;
+
public class HListGroup extends HVisible implements HItemValue {
public HListGroup() {
org.videolan.Logger.unimplemented(HListGroup.class.getName(), "");
@@ -42,13 +44,11 @@ public class HListGroup extends HVisible implements
HItemValue {
}
public static void setDefaultLook(HListGroupLook look) {
- DefaultLook = look;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, look);
}
public static HListGroupLook getDefaultLook() {
- if (DefaultLook == null)
- org.videolan.Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HListGroupLook)
BDJXletContext.getXletDefaultLook(PROPERTY_LOOK, DEFAULT_LOOK);
}
public HListElement[] getListContent() {
@@ -271,7 +271,8 @@ public class HListGroup extends HVisible implements
HItemValue {
public static final int DEFAULT_ICON_WIDTH = -3;
public static final int DEFAULT_ICON_HEIGHT = -4;
- private static HListGroupLook DefaultLook = null;
+ private static final String PROPERTY_LOOK = HListGroup.class.getName();
+ static final Class DEFAULT_LOOK = HListGroupLook.class;
private static final long serialVersionUID = 6012900970046475431L;
}
=====================================
src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java
=====================================
@@ -22,6 +22,8 @@ package org.havi.ui;
import java.awt.Color;
import java.awt.Font;
+import org.videolan.BDJXletContext;
+
public class HMultilineEntry extends HSinglelineEntry {
public HMultilineEntry() {
org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
@@ -45,13 +47,11 @@ public class HMultilineEntry extends HSinglelineEntry {
}
public static void setDefaultLook(HMultilineEntryLook look) {
- DefaultLook = look;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, look);
}
public static HSinglelineEntryLook getDefaultLook() {
- if (DefaultLook == null)
- org.videolan.Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HSinglelineEntryLook)
BDJXletContext.getXletDefaultLook(PROPERTY_LOOK, DEFAULT_LOOK);
}
public void setLook(HLook hlook) throws HInvalidLookException {
@@ -66,7 +66,8 @@ public class HMultilineEntry extends HSinglelineEntry {
org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
}
- private static HSinglelineEntryLook DefaultLook = null;
+ private static final Class DEFAULT_LOOK = HSinglelineEntryLook.class;
+ private static final String PROPERTY_LOOK =
HMultilineEntry.class.getName();
private static final long serialVersionUID = 2690386579157062435L;
}
=====================================
src/libbluray/bdj/java/org/havi/ui/HRange.java
=====================================
@@ -22,6 +22,8 @@ package org.havi.ui;
import org.havi.ui.event.HFocusEvent;
import org.havi.ui.event.HFocusListener;
+import org.videolan.BDJXletContext;
+
public class HRange extends HStaticRange implements HNavigable {
public HRange() {
org.videolan.Logger.unimplemented(HRange.class.getName(), "");
@@ -37,13 +39,11 @@ public class HRange extends HStaticRange implements
HNavigable {
}
public static void setDefaultLook(HRangeLook look) {
- DefaultLook = look;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, look);
}
public static HRangeLook getDefaultLook() {
- if (DefaultLook == null)
- org.videolan.Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HRangeLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,
DEFAULT_LOOK);
}
public void setMove(int keyCode, HNavigable target) {
@@ -100,7 +100,8 @@ public class HRange extends HStaticRange implements
HNavigable {
org.videolan.Logger.unimplemented(HRange.class.getName(), "");
}
- private static HRangeLook DefaultLook = null;
+ private static final Class DEFAULT_LOOK = HRangeLook.class;
+ private static final String PROPERTY_LOOK = HRange.class.getName();
private static final long serialVersionUID = 2739614186691834675L;
}
=====================================
src/libbluray/bdj/java/org/havi/ui/HRangeValue.java
=====================================
@@ -24,6 +24,8 @@ import org.havi.ui.event.HAdjustmentListener;
import org.havi.ui.event.HFocusEvent;
import org.havi.ui.event.HFocusListener;
+import org.videolan.BDJXletContext;
+
public class HRangeValue extends HRange implements HAdjustmentValue {
public HRangeValue() {
org.videolan.Logger.unimplemented(HRangeValue.class.getName(), "");
@@ -39,13 +41,11 @@ public class HRangeValue extends HRange implements
HAdjustmentValue {
}
public static void setDefaultLook(HRangeLook look) {
- DefaultLook = look;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, look);
}
public static HRangeLook getDefaultLook() {
- if (DefaultLook == null)
- org.videolan.Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HRangeLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,
DEFAULT_LOOK);
}
public void setMove(int keyCode, HNavigable target) {
@@ -150,7 +150,8 @@ public class HRangeValue extends HRange implements
HAdjustmentValue {
org.videolan.Logger.unimplemented(HRangeValue.class.getName(), "");
}
- private static HRangeLook DefaultLook = null;
+ private static final Class DEFAULT_LOOK = HRangeLook.class;
+ private static final String PROPERTY_LOOK = HRangeValue.class.getName();
private static final long serialVersionUID = -7809155734787063596L;
}
=====================================
src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java
=====================================
@@ -28,6 +28,8 @@ import org.havi.ui.event.HKeyListener;
import org.havi.ui.event.HTextEvent;
import org.havi.ui.event.HTextListener;
+import org.videolan.BDJXletContext;
+
public class HSinglelineEntry extends HVisible implements HTextValue {
public HSinglelineEntry() {
org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(),
"");
@@ -93,13 +95,11 @@ public class HSinglelineEntry extends HVisible implements
HTextValue {
}
public static void setDefaultLook(HSinglelineEntryLook look) {
- DefaultLook = look;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, look);
}
public static HSinglelineEntryLook getDefaultLook() {
- if (DefaultLook == null)
- org.videolan.Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HSinglelineEntryLook)
BDJXletContext.getXletDefaultLook(PROPERTY_LOOK, DEFAULT_LOOK);
}
public void setLook(HLook hlook) throws HInvalidLookException {
@@ -239,7 +239,8 @@ public class HSinglelineEntry extends HVisible implements
HTextValue {
private int maxChars;
- private static HSinglelineEntryLook DefaultLook = null;
+ private static final Class DEFAULT_LOOK = HSinglelineEntryLook.class;
+ private static final String PROPERTY_LOOK =
HSinglelineEntry.class.getName();
private static final long serialVersionUID = 7577783421311076636L;
}
=====================================
src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java
=====================================
@@ -21,6 +21,8 @@ package org.havi.ui;
import java.awt.Image;
+import org.videolan.BDJXletContext;
+
public class HStaticAnimation extends HVisible implements HNoInputPreferred,
HAnimateEffect {
public HStaticAnimation() {
@@ -42,13 +44,11 @@ public class HStaticAnimation extends HVisible implements
HNoInputPreferred,
}
public static void setDefaultLook(HAnimateLook hlook) {
- DefaultLook = hlook;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, hlook);
}
public static HAnimateLook getDefaultLook() {
- if (DefaultLook == null)
- org.videolan.Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HAnimateLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,
DEFAULT_LOOK);
}
public void start() {
@@ -100,7 +100,8 @@ public class HStaticAnimation extends HVisible implements
HNoInputPreferred,
return 0;
}
- private static HAnimateLook DefaultLook = null;
+ private static final Class DEFAULT_LOOK = HAnimateLook.class;
+ private static final String PROPERTY_LOOK =
HStaticAnimation.class.getName();
private static final long serialVersionUID = -7320112528206101937L;
}
=====================================
src/libbluray/bdj/java/org/havi/ui/HStaticRange.java
=====================================
@@ -22,6 +22,8 @@ package org.havi.ui;
import org.videolan.Logger;
+import org.videolan.BDJXletContext;
+
public class HStaticRange extends HVisible implements HNoInputPreferred,
HOrientable {
@@ -57,13 +59,11 @@ public class HStaticRange extends HVisible implements
HNoInputPreferred,
}
public static void setDefaultLook(HRangeLook look) {
- DefaultLook = look;
+ BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, look);
}
public static HRangeLook getDefaultLook() {
- if (DefaultLook == null)
- Logger.unimplemented("", "getDefaultLook");
- return DefaultLook;
+ return (HRangeLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,
DEFAULT_LOOK);
}
public int getOrientation() {
@@ -128,7 +128,8 @@ public class HStaticRange extends HVisible implements
HNoInputPreferred,
public final static int SLIDER_BEHAVIOR = 0;
public final static int SCROLLBAR_BEHAVIOR = 1;
- private static HRangeLook DefaultLook = null;
+ static final Class DEFAULT_LOOK = HRangeLook.class;
+ private static final String PROPERTY_LOOK = HStaticRange.class.getName();
private static final long serialVersionUID = 3871722305722412744L;
View it on GitLab:
https://code.videolan.org/videolan/libbluray/-/commit/4dfb9b0123b006ce5d66592dc8058f61e5c0cdc8
--
View it on GitLab:
https://code.videolan.org/videolan/libbluray/-/commit/4dfb9b0123b006ce5d66592dc8058f61e5c0cdc8
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
libbluray-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/libbluray-devel
