diff --git a/src/org/zlibrary/options/ZLBoolean3Option.java b/src/org/zlibrary/options/ZLBoolean3Option.java index 4816aec39..c97934beb 100644 --- a/src/org/zlibrary/options/ZLBoolean3Option.java +++ b/src/org/zlibrary/options/ZLBoolean3Option.java @@ -1,6 +1,5 @@ package org.zlibrary.options; -import org.zlibrary.options.*; import org.zlibrary.options.util.*; public final class ZLBoolean3Option extends ZLSimpleOption{ @@ -17,11 +16,12 @@ public final class ZLBoolean3Option extends ZLSimpleOption{ } public void setValue(ZLBoolean3 value){ - + //TODO установка значения } public ZLBoolean3Option(String category, String group, String optionName, ZLBoolean3 defaultValue){ super(category, group, optionName); myDefaultValue = defaultValue; + myValue = myDefaultValue; } } diff --git a/src/org/zlibrary/options/ZLBooleanOption.java b/src/org/zlibrary/options/ZLBooleanOption.java index d13f88975..8702279b5 100644 --- a/src/org/zlibrary/options/ZLBooleanOption.java +++ b/src/org/zlibrary/options/ZLBooleanOption.java @@ -10,16 +10,17 @@ public final class ZLBooleanOption extends ZLSimpleOption{ } public boolean getValue(){ - return true; + return myValue; } public void setValue(boolean value){ - + //TODO установка значения } public ZLBooleanOption (String category, String group, String optionName, boolean defaultValue){ super(category, group, optionName); myDefaultValue = defaultValue; + myValue = myDefaultValue; } } diff --git a/src/org/zlibrary/options/ZLColorOption.java b/src/org/zlibrary/options/ZLColorOption.java index 94110b0d5..81c1258e1 100644 --- a/src/org/zlibrary/options/ZLColorOption.java +++ b/src/org/zlibrary/options/ZLColorOption.java @@ -8,18 +8,18 @@ public final class ZLColorOption extends ZLOption{ private long myDefaultIntValue; public long getValue(){ - return 0; + return myIntValue; } public void setValue(ZLColor value){ - + //TODO установка значения } public ZLColorOption (String category, String group, String optionName, ZLColor defaultValue){ super(category, group, optionName); - //convert? - //myDefaultIntValue = defaultValue; + myDefaultIntValue = defaultValue.getIntValue(); + myIntValue = myDefaultIntValue; } } diff --git a/src/org/zlibrary/options/ZLDoubleOption.java b/src/org/zlibrary/options/ZLDoubleOption.java index a3c7becf4..d6db6a616 100644 --- a/src/org/zlibrary/options/ZLDoubleOption.java +++ b/src/org/zlibrary/options/ZLDoubleOption.java @@ -6,16 +6,17 @@ public final class ZLDoubleOption extends ZLOption{ private double myDefaultValue; public double getValue(){ - return 1.0; + return myValue; } public void setValue(double value){ - + //TODO установка значения } public ZLDoubleOption (String category, String group, String optionName, double defaultValue){ super(category, group, optionName); myDefaultValue = defaultValue; + myValue = myDefaultValue; } } diff --git a/src/org/zlibrary/options/ZLIntegerOption.java b/src/org/zlibrary/options/ZLIntegerOption.java index 0b33b3334..d4efbcbca 100644 --- a/src/org/zlibrary/options/ZLIntegerOption.java +++ b/src/org/zlibrary/options/ZLIntegerOption.java @@ -5,16 +5,17 @@ public final class ZLIntegerOption extends ZLOption{ private long myDefaultValue; public long getValue(){ - return 0; + return myValue; } public void setValue(long value){ - +// TODO установка значения } public ZLIntegerOption (String category, String group, String optionName, int defaultValue){ super(category, group, optionName); myDefaultValue = defaultValue; + myValue = myDefaultValue; } } diff --git a/src/org/zlibrary/options/ZLIntegerRangeOption.java b/src/org/zlibrary/options/ZLIntegerRangeOption.java index 53f81882a..fc1a1c39e 100644 --- a/src/org/zlibrary/options/ZLIntegerRangeOption.java +++ b/src/org/zlibrary/options/ZLIntegerRangeOption.java @@ -7,19 +7,19 @@ public final class ZLIntegerRangeOption extends ZLOption{ private long myMaxValue; public long getValue(){ - return 0; + return myValue; } public long getMinValue(){ - return 0; + return myMinValue; } public long getMaxValue(){ - return 0; + return myMaxValue; } public void setValue(long value){ - +// TODO установка значения } public ZLIntegerRangeOption (String category, String group, String optionName, long minValue, long maxValue, long defaultValue){ @@ -27,6 +27,7 @@ public final class ZLIntegerRangeOption extends ZLOption{ myDefaultValue = defaultValue; myMinValue = minValue; myMaxValue = maxValue; + myValue = myDefaultValue; } } diff --git a/src/org/zlibrary/options/ZLStringOption.java b/src/org/zlibrary/options/ZLStringOption.java index ab22f9e49..1c65aa03d 100644 --- a/src/org/zlibrary/options/ZLStringOption.java +++ b/src/org/zlibrary/options/ZLStringOption.java @@ -16,12 +16,13 @@ public final class ZLStringOption extends ZLSimpleOption { } public void setValue(String value){ - +// TODO установка значения } public ZLStringOption (String category, String group, String optionName, String defaultValue){ super(category, group, optionName); myDefaultValue = defaultValue; + myValue = myDefaultValue; } } diff --git a/src/org/zlibrary/options/util/ZLColor.java b/src/org/zlibrary/options/util/ZLColor.java index e0e868113..2b720cd5e 100644 --- a/src/org/zlibrary/options/util/ZLColor.java +++ b/src/org/zlibrary/options/util/ZLColor.java @@ -105,4 +105,8 @@ public class ZLColor { return new Color(myRed, myGreen, myBlue); } + public int getIntValue(){ + //TODO возвращение цвета одним числом + return 0; + } }