git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@49 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

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;
 	}
 }

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;
 	}
 
 }

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;
 	}
 	
 }

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;
 	}
 	
 }

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;
 	}
 	
 }

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;
 	}
 	
 }

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;
 	}
 	
 }

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;
+	}
 }